diff --git a/Dockerfile b/Dockerfile
index 87b5272cfe..8d8dca52fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,8 @@ RUN chown -R node:node *
 # Switch to non-root user
 USER node
 
+ENV NODE_ENV production
+
 # Define startup command
-CMD ["NODE_ENV=production", "node", "server/app.js"]
+CMD ["node", "server/app.js"]
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 824882fd7b..7c9bb3032d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   bhima:
     build: .
-    image: imaworldhealth/bhima
+    image: ghcr.io/third-culture-software/bhima
     restart: unless-stopped
     ports:
       - $PORT:$PORT