diff --git a/docker-compose.yml b/docker-compose.yml
index 7b4dfd9..2f7acaf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@
         ipv4_address: ${PROVISIONER_IP}
 
   identity-ms:
-    image: apache/fineract-cn-identity:0.0.1-M.1 # TODO replace with latest
+    image: apache/fineract-cn-identity:latest
     ports:
       - "2021:2021"
     environment:
@@ -62,28 +62,27 @@
       fineract:
         ipv4_address: ${IDENTITY_IP}
 
-  # TODO HAS ERRORS:
-#  rhythm-ms:
-#    image: apache/fineract-cn-rhythm:latest
-#    environment:
-#      activemq.brokerUrl: ${ACTIVEMQ_BROKER_URL}
-#      cassandra.contactPoints: ${CASSANDRA_CONTACT_POINTS}
-#      eureka.client.serviceUrl.defaultZone: ${EUREKA_CLIENT_SERVICE_URL_DEFAULT_ZONE}
-#      eureka.instance.hostname: ${EUREKA_INSTANCE_HOSTNAME}
-#      postgresql.host: ${POSTGRESQL_HOST}
-#      ribbon.listOfServers: ${RIBBON_EUREKA_SERVER}
-#      system.publicKey.exponent: ${PUBLIC_KEY_EXPONENT}
-#      system.publicKey.modulus: ${PUBLIC_KEY_MODULUS}
-#      system.publicKey.timestamp: ${PUBLIC_KEY_TIMESTAMP}
-#    deploy:
-#      replicas: 1
-#      restart_policy:
-#        condition: on-failure
-#    networks:
-#      external_tools_default:
-#      fineract:
-#          ipv4_address: ${RHYTHM_IP}
-
+  # TODO this image has error: https://issues.apache.org/jira/browse/FINCN-177
+  rhythm-ms:
+    image: apache/fineract-cn-rhythm:latest
+    environment:
+      activemq.brokerUrl: ${ACTIVEMQ_BROKER_URL}
+      cassandra.contactPoints: ${CASSANDRA_CONTACT_POINTS}
+      eureka.client.serviceUrl.defaultZone: ${EUREKA_CLIENT_SERVICE_URL_DEFAULT_ZONE}
+      eureka.instance.hostname: ${EUREKA_INSTANCE_HOSTNAME}
+      postgresql.host: ${POSTGRESQL_HOST}
+      ribbon.listOfServers: ${RIBBON_EUREKA_SERVER}
+      system.publicKey.exponent: ${PUBLIC_KEY_EXPONENT}
+      system.publicKey.modulus: ${PUBLIC_KEY_MODULUS}
+      system.publicKey.timestamp: ${PUBLIC_KEY_TIMESTAMP}
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+    networks:
+      external_tools_default:
+      fineract:
+          ipv4_address: ${RHYTHM_IP}
 
   office-ms:
     image: apache/fineract-cn-office:latest
@@ -227,7 +226,7 @@
         ipv4_address: ${REPORTING_IP}
 
   cheques-ms:
-    image: apache/fineract-cn-reporting:latest
+    image: apache/fineract-cn-cheques:latest
     ports:
       - "2030:2030"
     environment:
@@ -287,7 +286,7 @@
         ipv4_address: ${GROUP_IP}
 
   notifications-ms:
-    image: aasaru/fineract-cn-notifications:latest # TODO switch to apache repo
+    image: apache/fineract-cn-notifications:latest
     ports:
      - "2033:2033"
     environment:
@@ -307,7 +306,7 @@
         ipv4_address: ${NOTIFICATIONS_IP}
 
   fims-web-app:
-    image: aasaru/fineract-cn-fims-web-app:latest # TODO switch to apache repo
+    image: apache/fineract-cn-fims-web-app:latest
     ports:
       - "8888:8888"
     networks:
diff --git a/env_variables b/env_variables
index dcec372..12b167a 100644
--- a/env_variables
+++ b/env_variables
@@ -25,6 +25,6 @@
 TELLER_IP=172.16.238.28
 REPORTING_IP=172.16.238.29
 CHEQUES_IP=172.16.238.30
-PAYROLL_IP_IP=172.16.238.31
+PAYROLL_IP=172.16.238.31
 GROUP_IP=172.16.238.32
 NOTIFICATIONS_IP=172.16.238.33