diff --git a/.drone.yml b/.drone.yml
index 21c81dc..1211f09 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -47,15 +47,15 @@ steps:
      password:         
        from_secret: SECRET_REGISTRY_PASSWORD
    environment:
-     CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER:
+     MARIADB_USER:
        from_secret: db_user
-     CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
+     MARIADB_PASSWORD:
        from_secret: db_password
-     CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE:
+     MARIADB_DATABASE:
        from_secret: db_database
-     CODEFIRST_CLIENTDRONE_ENV_CLIENT_ID:
+     CLIENT_ID:
        from_secret: spotify_client_id
-     CODEFIRST_CLIENTDRONE_ENV_CLIENT_SECRET:
+     CLIENT_SECRET:
        from_secret: spotify_client_secret
    depends_on: [ create-bigbrother-database ]
 
@@ -66,6 +66,26 @@ steps:
      CONTAINERNAME: bigbrotherserver
      COMMAND: create
      OVERWRITE: true
+     MARIADB_USER:
+       from_secret: db_user
+     MARIADB_PASSWORD:
+       from_secret: db_password
+     MARIADB_DATABASE:
+       from_secret: db_database
+     CLIENT_ID:
+       from_secret: spotify_client_id
+     CLIENT_SECRET:
+       from_secret: spotify_client_secret
+     CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER:
+       from_secret: db_user
+     CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
+       from_secret: db_password
+     CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE:
+       from_secret: db_database
+     CODEFIRST_CLIENTDRONE_ENV_CLIENT_ID:
+       from_secret: spotify_client_id
+     CODEFIRST_CLIENTDRONE_ENV_CLIENT_SECRET:
+       from_secret: spotify_client_secret
    depends_on: [ build-image-server ]
   
   # - name: build-image-script
diff --git a/callback-server/Dockerfile b/callback-server/Dockerfile
index a054332..be12147 100644
--- a/callback-server/Dockerfile
+++ b/callback-server/Dockerfile
@@ -7,8 +7,10 @@ COPY callback-server/package*.json ./callback-server/
 RUN npm install ./callback-server
 COPY callback-server ./callback-server/
 
+RUN env > .env
+
 # Expose the port the app runs on
 EXPOSE 80
 
 # Command to run the application
-CMD env > .env && node --env-file=.env callback-server/app.js
\ No newline at end of file
+CMD ["node", "--env-file=.env" , "callback-server/app.js"]
\ No newline at end of file