diff --git a/customer-ms-scripts/Dockerfile b/customer-ms-scripts/Dockerfile
index 8a3bc3a..e17621f 100644
--- a/customer-ms-scripts/Dockerfile
+++ b/customer-ms-scripts/Dockerfile
@@ -1,9 +1,9 @@
 FROM openjdk:8-jdk-alpine
 
 ARG customer_port=2024
-ARG cassandraIp=172.16.238.5
-ARG activemqIp=172.16.238.3
-ARG eurekaIp=172.16.238.2
+ARG cassandraIp=cassandra.service
+ARG activemqIp=activemq.service
+ARG eurekaIp=eureka.service
 
 ENV server.max-http-header-size=16384 \
     bonecp.partitionCount=1 \
@@ -19,7 +19,7 @@ ENV server.max-http-header-size=16384 \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
diff --git a/deposit-account-management-ms-scripts/Dockerfile b/deposit-account-management-ms-scripts/Dockerfile
index 6e63cbd..9e2043f 100644
--- a/deposit-account-management-ms-scripts/Dockerfile
+++ b/deposit-account-management-ms-scripts/Dockerfile
@@ -9,14 +9,14 @@ ENV server.max-http-header-size=16384 \
     bonecp.acquireIncrement=1 \
     server.port=9090 \
     cassandra.clusterName="Test Cluster" \
-    cassandra.contactPoints=172.16.238.5:9042 \
+    cassandra.contactPoints=cassandra.service:9042 \
     cassandra.keyspace=seshat \
     cassandra.cl.read=ONE \
     cassandra.cl.write=ONE \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
@@ -25,15 +25,15 @@ ENV server.max-http-header-size=16384 \
     flyway.enabled=false \
     feign.hystrix.enabled=false \
     ribbon.eureka.enabled=false \
-    ribbon.listOfServers=172.16.238.2:9090 \
-    eureka.client.serviceUrl.defaultZone=http://172.16.238.2:8761/eureka \
+    ribbon.listOfServers=eureka.service:9090 \
+    eureka.client.serviceUrl.defaultZone=http://eureka.service:8761/eureka \
     spring.cloud.discovery.enabled=true \
-    eureka.instance.hostname=172.16.238.2 \
+    eureka.instance.hostname=eureka.service \
     eureka.client.fetchRegistry=true \
     eureka.registration.enabled=false \
     eureka.instance.leaseRenewalIntervalInSeconds=1 \
     eureka.client.instanceInfoReplicationIntervalSeconds=1 \
-    activemq.brokerUrl=tcp://172.16.238.3:61616 \
+    activemq.brokerUrl=tcp://activemq.service:61616 \
     ribbon.eureka.enabled=true \
     system.initialclientid=service-runner
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7649499..ef97f84 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,57 +1,66 @@
 version: '3'
 services:
-    # provisioner-ms:
-    #   build:
-    #     context: ./provisioner-ms-scripts
-    #     dockerfile: Dockerfile
-    #   container_name: provisioner-ms
-    #   environment:
-    #     eureka.instance.hostname: 172.16.238.2
-    #     ribbon.listOfServers: 172.16.238.2:9090
-    #     eureka.client.serviceUrl.defaultZone: http://172.16.238.2:8761/eureka
-    #     activemq.brokerUrl: tcp://172.16.238.3:61616
-    #     cassandra.contactPoints: 172.16.238.5:9042
-    #     mariadb.host: 172.16.238.4
-    #   networks:
-    #     default:
-    #       ipv4_address: 172.16.238.6
-    # identity-ms:
-    #   build:
-    #     context: ./identity-ms-scripts
-    #     dockerfile: Dockerfile
-    #   container_name: identity-ms
-    #   environment:
-    #     eureka.instance.hostname: 172.16.238.2
-    #     ribbon.listOfServers: 172.16.238.2:9090
-    #     eureka.client.serviceUrl.defaultZone: http://172.16.238.2:8761/eureka
-    #     activemq.brokerUrl: tcp://172.16.238.3:61616
-    #     cassandra.contactPoints: 172.16.238.5:9042
-    #     mariadb.host: 172.16.238.4
-    #     system.publicKey.timestamp: 2018-10-09T00_29_52
-    #     system.publicKey.modulus: 19397397801156192872348448981549818906094025097005232831227640136750089825602668458340881212709686204576589867644257524422566732280563020880017665102060979931883631841715201842821221066589895272186377061985376796893104016071559211905066015826591817049777361909021915947076497443050843027811640154132776581253862416848467674401029105512897305865711755250981974529416042952285926604224825669050536820330643041952941760491204063224366182608008677937228634071650573350610365644906630307029850903622183929798989353595260169577067555054746344003796739968034065368472576276213174407031706324322626856530646818669421534500701
-    #     system.publicKey.exponent: 65537
-    #   networks:
-    #     default:
-    #       ipv4_address: 172.16.238.7
-    rhythm-ms:
-      build:
-        context: ./rhythm-ms-scripts
-        dockerfile: Dockerfile
-      container_name: rhythm-ms
-      environment:
-        eureka.instance.hostname: 172.16.238.2
-        ribbon.listOfServers: 172.16.238.2:9090
-        eureka.client.serviceUrl.defaultZone: http://172.16.238.2:8761/eureka
-        activemq.brokerUrl: tcp://172.16.238.3:61616
-        cassandra.contactPoints: 172.16.238.5:9042
-        mariadb.host: 172.16.238.4
-        system.publicKey.timestamp: 2018-10-09T00_29_52
-        system.publicKey.modulus: 19397397801156192872348448981549818906094025097005232831227640136750089825602668458340881212709686204576589867644257524422566732280563020880017665102060979931883631841715201842821221066589895272186377061985376796893104016071559211905066015826591817049777361909021915947076497443050843027811640154132776581253862416848467674401029105512897305865711755250981974529416042952285926604224825669050536820330643041952941760491204063224366182608008677937228634071650573350610365644906630307029850903622183929798989353595260169577067555054746344003796739968034065368472576276213174407031706324322626856530646818669421534500701
-        system.publicKey.exponent: 65537
-      networks:
-        default:
-          ipv4_address: 172.16.238.8
-#   office-ms:
+#  provisioner-ms:
+#    build:
+#      context: ./provisioner-ms-scripts
+#      dockerfile: Dockerfile
+#    container_name: provisioner-ms
+#    environment:
+#      eureka.instance.hostname: eureka.service
+#      ribbon.listOfServers: eureka.service:9090
+#      eureka.client.serviceUrl.defaultZone: http://eureka.service:8761/eureka
+#      activemq.brokerUrl: tcp://activemq.service:61616
+#      cassandra.contactPoints: cassandra.service:9042
+#      mariadb.host: mariadb.service
+#    networks:
+#      default:
+#        #ipv4_address: 172.16.238.6
+#        aliases:
+#          - provisioner.service
+#      app_net:
+#  identity-ms:
+#    build:
+#      context: ./identity-ms-scripts
+#      dockerfile: Dockerfile
+#    container_name: identity-ms
+#    environment:
+#      eureka.instance.hostname: eureka.service
+#      ribbon.listOfServers: eureka.service:9090
+#      eureka.client.serviceUrl.defaultZone: http://eureka.service:8761/eureka
+#      activemq.brokerUrl: tcp://activemq.service:61616
+#      cassandra.contactPoints: cassandra.service:9042
+#      mariadb.host: mariadb.service
+#      system.publicKey.timestamp: 2018-10-09T00_29_52
+#      system.publicKey.modulus: 19397397801156192872348448981549818906094025097005232831227640136750089825602668458340881212709686204576589867644257524422566732280563020880017665102060979931883631841715201842821221066589895272186377061985376796893104016071559211905066015826591817049777361909021915947076497443050843027811640154132776581253862416848467674401029105512897305865711755250981974529416042952285926604224825669050536820330643041952941760491204063224366182608008677937228634071650573350610365644906630307029850903622183929798989353595260169577067555054746344003796739968034065368472576276213174407031706324322626856530646818669421534500701
+#      system.publicKey.exponent: 65537
+#    networks:
+#      default:
+#        #ipv4_address: 172.16.238.7
+#        aliases:
+#          - identity.service
+#      app_net:
+  rhythm-ms:
+    build:
+      context: ./rhythm-ms-scripts
+      dockerfile: Dockerfile
+    container_name: rhythm-ms
+    environment:
+      eureka.instance.hostname: eureka.service
+      ribbon.listOfServers: eureka.service:9090
+      eureka.client.serviceUrl.defaultZone: http://eureka.service:8761/eureka
+      activemq.brokerUrl: tcp://activemq.service:61616
+      cassandra.contactPoints: cassandra.service:9042
+      mariadb.host: mariadb.service
+      system.publicKey.timestamp: 2018-10-09T00_29_52
+      system.publicKey.modulus: 19397397801156192872348448981549818906094025097005232831227640136750089825602668458340881212709686204576589867644257524422566732280563020880017665102060979931883631841715201842821221066589895272186377061985376796893104016071559211905066015826591817049777361909021915947076497443050843027811640154132776581253862416848467674401029105512897305865711755250981974529416042952285926604224825669050536820330643041952941760491204063224366182608008677937228634071650573350610365644906630307029850903622183929798989353595260169577067555054746344003796739968034065368472576276213174407031706324322626856530646818669421534500701
+      system.publicKey.exponent: 65537
+    networks:
+      default:
+        #ipv4_address: 172.16.238.8
+        aliases:
+          - rythm.service
+      app_net:
+#  office-ms:
 #     build:
 #       context: ./office-ms-scripts
 #       dockerfile: Dockerfile
@@ -62,57 +71,78 @@ services:
 #       system.publicKey.exponent: 65537
 #     networks:
 #       default:
-#         ipv4_address: 172.16.238.9
-  # customer-ms:
-  #   build:
-  #     context: ./customer-ms-scripts
-  #     dockerfile: Dockerfile
-  #   container_name: customer-ms
-  #   networks:
-  #     default:
-  #       ipv4_address: 172.16.238.10
-  # portfolio-ms:
-  #   build:
-  #     context: ./portfolio-ms-scripts
-  #     dockerfile: Dockerfile
-  #   container_name: portfolio-ms
-  #   networks:
-  #     default:
-  #       ipv4_address: 172.16.238.11
-  # deposit-account-management-ms:
-  #   build:
-  #     context: ./deposit-account-management-ms-scripts
-  #     dockerfile: Dockerfile
-  #   container_name: deposit-ms
-  #   networks:
-  #     default:
-  #       ipv4_address: 172.16.238.12
-  # teller-ms:
-  #   build:
-  #     context: ./teller-ms-scripts
-  #     dockerfile: Dockerfile
-  #   container_name: teller-ms
-  #   networks:
-  #     default:
-  #       ipv4_address: 172.16.238.13
-  # report-ms:
-  #   build:
-  #     context: ./reporting-ms-scripts
-  #     dockerfile: Dockerfile
-  #   container_name: report-ms
-  #   networks:
-  #     default:
-  #       ipv4_address: 172.16.238.14
-  # payroll-ms:
-  #   build:
-  #     context: ./payroll-ms-scripts
-  #     dockerfile: Dockerfile
-  #   container_name: payroll-ms
-  #   networks:
-  #     default:
-  #       ipv4_address: 172.16.238.15
+#         #ipv4_address: 172.16.238.9
+#         aliases:
+#         - office.service
+#       app_net:
+#  customer-ms:
+#    build:
+#      context: ./customer-ms-scripts
+#      dockerfile: Dockerfile
+#    container_name: customer-ms
+#    networks:
+#      default:
+#        #ipv4_address: 172.16.238.10
+#        aliases:
+#        - customer.service
+#      app_net:
+#  portfolio-ms:
+#    build:
+#      context: ./portfolio-ms-scripts
+#      dockerfile: Dockerfile
+#    container_name: portfolio-ms
+#    networks:
+#      default:
+#        #ipv4_address: 172.16.238.11
+#        aliases:
+#        - portfolio.service
+#      app_net:
+#  deposit-account-management-ms:
+#    build:
+#      context: ./deposit-account-management-ms-scripts
+#      dockerfile: Dockerfile
+#    container_name: deposit-ms
+#    networks:
+#      default:
+#        #ipv4_address: 172.16.238.12
+#        aliases:
+#        - deposit-account-management.service
+#      app_net:
+#  teller-ms:
+#    build:
+#      context: ./teller-ms-scripts
+#      dockerfile: Dockerfile
+#    container_name: teller-ms
+#    networks:
+#      default:
+#        #ipv4_address: 172.16.238.13
+#        aliases:
+#        - teller.service
+#      app_net:
+#  report-ms:
+#    build:
+#      context: ./reporting-ms-scripts
+#      dockerfile: Dockerfile
+#    container_name: report-ms
+#    networks:
+#      default:
+#        #ipv4_address: 172.16.238.14
+#        aliases:
+#        - reporting.service
+#      app_net:
+#  payroll-ms:
+#    build:
+#      context: ./payroll-ms-scripts
+#      dockerfile: Dockerfile
+#    container_name: payroll-ms
+#    networks:
+#      default:
+#        #ipv4_address: 172.16.238.15
+#        aliases:
+#        - payroll.service
+#      app_net:
+
 
 networks:
-  default:
-    external:
-      name: externaltools_app_net
+  app_net:
+    driver: bridge
diff --git a/external-tools/docker-compose.yml b/external-tools/docker-compose.yml
index 8c0bdb5..d3fe54e 100644
--- a/external-tools/docker-compose.yml
+++ b/external-tools/docker-compose.yml
@@ -11,12 +11,14 @@ services:
       ACTIVEMQ_CONFIG_MINMEMORY: 512
       ACTIVEMQ_CONFIG_MAXMEMORY: 1024
     healthcheck:
-      test: curl -u admin:admin -s http://172.16.238.3:8161/admin
+      test: curl -u admin:admin -s http://activemq.service:8161/admin
       interval: 5s
       retries: 20
     networks:
       app_net:
-        ipv4_address: 172.16.238.3
+        #ipv4_address: 172.16.238.3
+        aliases:
+          - activemq.service
 
   eureka:
     build: ../eureka_server
@@ -25,7 +27,9 @@ services:
       - "8761:8761"
     networks:
       app_net:
-        ipv4_address: 172.16.238.2
+        #ipv4_address: 172.16.238.2
+        aliases:
+          - eureka.service
 
   mariadb:
     image: mariadb
@@ -37,25 +41,29 @@ services:
     volumes:
       - mariadb-volume:/var/lib/mysql
     healthcheck:
-      test: mysql --user=root --password=mysql -h 172.16.238.4
+      test: mysql --user=root --password=mysql -h mariadb.service
       interval: 5s
       retries: 20
     networks:
       app_net:
-        ipv4_address: 172.16.238.4
+        #ipv4_address: 172.16.238.4
+        aliases:
+          - mariadb.service
 
   cassandra:
     image: cassandra
     container_name: cassandra
     ports:
-      - "9142:9042"
+      - "9042:9042"
     healthcheck:
-      test: cqlsh ping -h 172.16.238.5
+      test: cqlsh ping -h cassandra.service
       interval: 5s
       retries: 20
     networks:
       app_net:
-        ipv4_address: 172.16.238.5
+        #ipv4_address: 172.16.238.5
+        aliases:
+          - cassandra.service
     volumes:
       - cassandra-volume:/var/lib/cassandra
 
diff --git a/identity-ms-scripts/Dockerfile b/identity-ms-scripts/Dockerfile
index f6374e3..cbf111e 100644
--- a/identity-ms-scripts/Dockerfile
+++ b/identity-ms-scripts/Dockerfile
@@ -1,9 +1,9 @@
 FROM openjdk:8-jdk-alpine
 
 ARG identity_port=2021
-ARG cassandraIp=172.16.238.5
-ARG activemqIp=172.16.238.3
-ARG eurekaIp=172.16.238.2
+ARG cassandraIp=cassandra.service
+ARG activemqIp=activemq.service
+ARG eurekaIp=eureka.service
 ARG timestamp=2018-09-25T03_31_48
 ARG publicKey_modulus=17318007762202276915667781209840284241720502707521873078897505356138539383363050049667785138353485988207634647603188455336356425002849760281049240791476283942497160184775797971723519829903627967481361379054447959291649289057756603579576792654752639713561637781944789557030934756137133197066405169971699156642941128638988408730741608813413507008146153853427551648252129508313718401750574588730639392661484581481667612606514906545379914299119012278873059875167157788525230442044206536668591517665262097071112361699974092567361081634436230322305603628346761177821595272443570075328903137181224797586174954037775119011659
 ARG publicKey_exponent=65537
@@ -22,7 +22,7 @@ ENV server.max-http-header-size=16384 \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
diff --git a/office-ms-scripts/Dockerfile b/office-ms-scripts/Dockerfile
index 44acfa1..9da0515 100644
--- a/office-ms-scripts/Dockerfile
+++ b/office-ms-scripts/Dockerfile
@@ -9,14 +9,14 @@ ENV server.max-http-header-size=16384 \
     bonecp.acquireIncrement=1 \
     server.port=9090 \
     cassandra.clusterName="Test Cluster" \
-    cassandra.contactPoints=172.16.238.5:9042 \
+    cassandra.contactPoints=cassandra.service:9042 \
     cassandra.keyspace=seshat \
     cassandra.cl.read=ONE \
     cassandra.cl.write=ONE \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
@@ -25,15 +25,15 @@ ENV server.max-http-header-size=16384 \
     flyway.enabled=false \
     feign.hystrix.enabled=false \
     ribbon.eureka.enabled=false \
-    ribbon.listOfServers=172.16.238.2:9090 \
-    eureka.client.serviceUrl.defaultZone=http://172.16.238.2:8761/eureka \
+    ribbon.listOfServers=eureka.service:9090 \
+    eureka.client.serviceUrl.defaultZone=http://eureka.service:8761/eureka \
     spring.cloud.discovery.enabled=true \
-    eureka.instance.hostname=172.16.238.2 \
+    eureka.instance.hostname=eureka.service \
     eureka.client.fetchRegistry=true \
     eureka.registration.enabled=false \
     eureka.instance.leaseRenewalIntervalInSeconds=1 \
     eureka.client.instanceInfoReplicationIntervalSeconds=1 \
-    activemq.brokerUrl=tcp://172.16.238.3:61616 \
+    activemq.brokerUrl=tcp://activemq.service:61616 \
     ribbon.eureka.enabled=true \
     system.initialclientid=service-runner \
     spring.profiles.active=production
diff --git a/payroll-ms-scripts/Dockerfile b/payroll-ms-scripts/Dockerfile
index 34e43e5..4e50817 100644
--- a/payroll-ms-scripts/Dockerfile
+++ b/payroll-ms-scripts/Dockerfile
@@ -9,14 +9,14 @@ ENV server.max-http-header-size=16384 \
     bonecp.acquireIncrement=1 \
     server.port=9090 \
     cassandra.clusterName="Test Cluster" \
-    cassandra.contactPoints=172.16.238.5:9042 \
+    cassandra.contactPoints=cassandra.service:9042 \
     cassandra.keyspace=seshat \
     cassandra.cl.read=ONE \
     cassandra.cl.write=ONE \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
@@ -25,15 +25,15 @@ ENV server.max-http-header-size=16384 \
     flyway.enabled=false \
     feign.hystrix.enabled=false \
     ribbon.eureka.enabled=false \
-    ribbon.listOfServers=172.16.238.2:9090 \
-    eureka.client.serviceUrl.defaultZone=http://172.16.238.2:8761/eureka \
+    ribbon.listOfServers=eureka.service:9090 \
+    eureka.client.serviceUrl.defaultZone=http://eureka.service:8761/eureka \
     spring.cloud.discovery.enabled=true \
-    eureka.instance.hostname=172.16.238.2 \
+    eureka.instance.hostname=eureka.service \
     eureka.client.fetchRegistry=true \
     eureka.registration.enabled=false \
     eureka.instance.leaseRenewalIntervalInSeconds=1 \
     eureka.client.instanceInfoReplicationIntervalSeconds=1 \
-    activemq.brokerUrl=tcp://172.16.238.3:61616 \
+    activemq.brokerUrl=tcp://activemq.service:61616 \
     ribbon.eureka.enabled=true \
     system.initialclientid=service-runner
 
diff --git a/portfolio-ms-scripts/Dockerfile b/portfolio-ms-scripts/Dockerfile
index d97767a..10edbd3 100644
--- a/portfolio-ms-scripts/Dockerfile
+++ b/portfolio-ms-scripts/Dockerfile
@@ -9,14 +9,14 @@ ENV server.max-http-header-size=16384 \
     bonecp.acquireIncrement=1 \
     server.port=9090 \
     cassandra.clusterName="Test Cluster" \
-    cassandra.contactPoints=172.16.238.5:9042 \
+    cassandra.contactPoints=cassandra.service:9042 \
     cassandra.keyspace=seshat \
     cassandra.cl.read=ONE \
     cassandra.cl.write=ONE \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
@@ -25,15 +25,15 @@ ENV server.max-http-header-size=16384 \
     flyway.enabled=false \
     feign.hystrix.enabled=false \
     ribbon.eureka.enabled=false \
-    ribbon.listOfServers=172.16.238.2:9090 \
-    eureka.client.serviceUrl.defaultZone=http://172.16.238.2:8761/eureka \
+    ribbon.listOfServers=eureka.service:9090 \
+    eureka.client.serviceUrl.defaultZone=http://eureka.service:8761/eureka \
     spring.cloud.discovery.enabled=true \
-    eureka.instance.hostname=172.16.238.2 \
+    eureka.instance.hostname=eureka.service \
     eureka.client.fetchRegistry=true \
     eureka.registration.enabled=false \
     eureka.instance.leaseRenewalIntervalInSeconds=1 \
     eureka.client.instanceInfoReplicationIntervalSeconds=1 \
-    activemq.brokerUrl=tcp://172.16.238.3:61616 \
+    activemq.brokerUrl=tcp://activemq.service:61616 \
     ribbon.eureka.enabled=true \
     portfolio.bookLateFeesAndInterestAsUser=imhotep \
     system.initialclientid=service-runner
diff --git a/provisioner-ms-scripts/Dockerfile b/provisioner-ms-scripts/Dockerfile
index 149b401..3e0b47e 100644
--- a/provisioner-ms-scripts/Dockerfile
+++ b/provisioner-ms-scripts/Dockerfile
@@ -1,9 +1,9 @@
 FROM openjdk:8-jdk-alpine
 
 ARG provisioner_port=2020
-ARG cassandraIp=172.16.238.5
-ARG activemqIp=172.16.238.3
-ARG eurekaIp=172.16.238.2
+ARG cassandraIp=cassandra.service
+ARG activemqIp=activemq.service
+ARG eurekaIp=eureka.service
 
 ENV server.max-http-header-size=16384 \
     bonecp.partitionCount=1 \
@@ -19,7 +19,7 @@ ENV server.max-http-header-size=16384 \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
diff --git a/provisioner.sh b/provisioner.sh
index b193cbf..da63b1d 100644
--- a/provisioner.sh
+++ b/provisioner.sh
@@ -61,7 +61,7 @@ curl -H "Content-Type: application/json" -H "User: wepemnefret" -H "Authorizatio
 	"description": "All in one Demo Server",
 	"cassandraConnectionInfo": {
 		"clusterName": "Test Cluster",
-		"contactPoints": "172.16.238.5:9042",
+		"contactPoints": "cassandra.service:9042",
 		"keyspace": "playground",
 		"replicationType": "Simple",
 		"replicas": "3"
@@ -69,7 +69,7 @@ curl -H "Content-Type: application/json" -H "User: wepemnefret" -H "Authorizatio
 	"databaseConnectionInfo": {
 		"driverClass": "org.mariadb.jdbc.Driver",
 		"databaseName": "playground",
-		"host": "172.16.238.4",
+		"host": "mariadb.service",
 		"port": "3306",
 		"user": "root",
 		"password": "mysql"
diff --git a/reporting-ms-scripts/Dockerfile b/reporting-ms-scripts/Dockerfile
index 5d1d0f9..73f0572 100644
--- a/reporting-ms-scripts/Dockerfile
+++ b/reporting-ms-scripts/Dockerfile
@@ -9,14 +9,14 @@ ENV server.max-http-header-size=16384 \
     bonecp.acquireIncrement=1 \
     server.port=9090 \
     cassandra.clusterName="Test Cluster" \
-    cassandra.contactPoints=172.16.238.5:9042 \
+    cassandra.contactPoints=cassandra.service:9042 \
     cassandra.keyspace=seshat \
     cassandra.cl.read=ONE \
     cassandra.cl.write=ONE \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
@@ -25,15 +25,15 @@ ENV server.max-http-header-size=16384 \
     flyway.enabled=false \
     feign.hystrix.enabled=false \
     ribbon.eureka.enabled=false \
-    ribbon.listOfServers=172.16.238.2:9090 \
-    eureka.client.serviceUrl.defaultZone=http://172.16.238.2:8761/eureka \
+    ribbon.listOfServers=eureka.service:9090 \
+    eureka.client.serviceUrl.defaultZone=http://eureka.service:8761/eureka \
     spring.cloud.discovery.enabled=true \
-    eureka.instance.hostname=172.16.238.2 \
+    eureka.instance.hostname=eureka.service \
     eureka.client.fetchRegistry=true \
     eureka.registration.enabled=false \
     eureka.instance.leaseRenewalIntervalInSeconds=1 \
     eureka.client.instanceInfoReplicationIntervalSeconds=1 \
-    activemq.brokerUrl=tcp://172.16.238.3:61616 \
+    activemq.brokerUrl=tcp://activemq.service:61616 \
     ribbon.eureka.enabled=true \
     system.initialclientid=service-runner
 
diff --git a/rhythm-ms-scripts/Dockerfile b/rhythm-ms-scripts/Dockerfile
index beb65a4..6e6a9a5 100644
--- a/rhythm-ms-scripts/Dockerfile
+++ b/rhythm-ms-scripts/Dockerfile
@@ -9,14 +9,14 @@ ENV server.max-http-header-size=16384 \
     bonecp.acquireIncrement=1 \
     server.port=9090 \
     cassandra.clusterName="Test Cluster" \
-    cassandra.contactPoints=172.16.238.5:9042 \
+    cassandra.contactPoints=cassandra.service:9042 \
     cassandra.keyspace=seshat \
     cassandra.cl.read=ONE \
     cassandra.cl.write=ONE \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
@@ -25,15 +25,15 @@ ENV server.max-http-header-size=16384 \
     flyway.enabled=false \
     feign.hystrix.enabled=false \
     ribbon.eureka.enabled=false \
-    ribbon.listOfServers=172.16.238.2:9090 \
-    eureka.client.serviceUrl.defaultZone=http://172.16.238.2:8761/eureka \
+    ribbon.listOfServers=eureka.service:9090 \
+    eureka.client.serviceUrl.defaultZone=http://eureka.service:8761/eureka \
     spring.cloud.discovery.enabled=true \
-    eureka.instance.hostname=172.16.238.2 \
+    eureka.instance.hostname=eureka.service \
     eureka.client.fetchRegistry=true \
     eureka.registration.enabled=false \
     eureka.instance.leaseRenewalIntervalInSeconds=1 \
     eureka.client.instanceInfoReplicationIntervalSeconds=1 \
-    activemq.brokerUrl=tcp://172.16.238.3:61616 \
+    activemq.brokerUrl=tcp://activemq.service:61616 \
     ribbon.eureka.enabled=true \
     system.initialclientid=service-runner \
     system.publicKey.timestamp=2018-09-25T03_31_48 \
diff --git a/start-up.sh b/start-up.sh
index bf6225d..65e2073 100755
--- a/start-up.sh
+++ b/start-up.sh
@@ -2,7 +2,7 @@
 
 cd external-tools/
 docker-compose up -d
-while ! nc -z 172.16.238.5 9042; do
+while ! nc -z 127.0.0.1 9042; do
   echo "Cassandra is unavailable - sleeping"
   sleep 1
 done
diff --git a/teller-ms-scripts/Dockerfile b/teller-ms-scripts/Dockerfile
index 0a36380..b3e0333 100644
--- a/teller-ms-scripts/Dockerfile
+++ b/teller-ms-scripts/Dockerfile
@@ -9,14 +9,14 @@ ENV server.max-http-header-size=16384 \
     bonecp.acquireIncrement=1 \
     server.port=9090 \
     cassandra.clusterName="Test Cluster" \
-    cassandra.contactPoints=172.16.238.5:9042 \
+    cassandra.contactPoints=cassandra.service:9042 \
     cassandra.keyspace=seshat \
     cassandra.cl.read=ONE \
     cassandra.cl.write=ONE \
     cassandra.cl.delete=ONE \
     mariadb.driverClass=org.mariadb.jdbc.Driver \
     mariadb.database=seshat \
-    mariadb.host=172.16.238.4 \
+    mariadb.host=mariadb.service \
     mariadb.port=3306 \
     mariadb.user=root \
     mariadb.password=mysql \
@@ -25,15 +25,15 @@ ENV server.max-http-header-size=16384 \
     flyway.enabled=false \
     feign.hystrix.enabled=false \
     ribbon.eureka.enabled=false \
-    ribbon.listOfServers=172.16.238.2:9090 \
-    eureka.client.serviceUrl.defaultZone=http://172.16.238.2:8761/eureka \
+    ribbon.listOfServers=eureka.service:9090 \
+    eureka.client.serviceUrl.defaultZone=http://eureka.service:8761/eureka \
     spring.cloud.discovery.enabled=true \
-    eureka.instance.hostname=172.16.238.2 \
+    eureka.instance.hostname=eureka.service \
     eureka.client.fetchRegistry=true \
     eureka.registration.enabled=false \
     eureka.instance.leaseRenewalIntervalInSeconds=1 \
     eureka.client.instanceInfoReplicationIntervalSeconds=1 \
-    activemq.brokerUrl=tcp://172.16.238.3:61616 \
+    activemq.brokerUrl=tcp://activemq.service:61616 \
     ribbon.eureka.enabled=true \
     system.initialclientid=service-runner