diff --git a/.github/workflows/staging-ci-cd.yml b/.github/workflows/staging-ci-cd.yml
index 3d0679ebb9909af5a68c6baf5b95d9b0d80656b6..b35de490c1cb650758904ced6a7f9b0b957fe67b 100644
--- a/.github/workflows/staging-ci-cd.yml
+++ b/.github/workflows/staging-ci-cd.yml
@@ -88,5 +88,5 @@ jobs:
         run: export DOCKER_BUILDKIT=1
       - name: Build Docker Image
         run: |
-          docker build --build-arg PRODUCTION=$staging --build-arg JDBC_STAGING_DATABASE_PASSWORD=${{ secrets.JDBC_STAGING_DATABASE_PASSWORD }} --build-arg JDBC_STAGING_DATABASE_URL=${{ secrets.JDBC_STAGING_DATABASE_URL }} --build-arg JDBC_STAGING_DATABASE_USERNAME=${{ secrets.JDBC_STAGING_DATABASE_USERNAME }} -t ${{ secrets.REGISTRY_USER }}/${{ secrets.IMAGE_NAME }}:${{ secrets.IMAGE_TAG }} .
+          docker build -t ${{ secrets.REGISTRY_USER }}/${{ secrets.IMAGE_NAME }}:${{ secrets.IMAGE_TAG }} .
           docker push ${{ secrets.REGISTRY_USER }}/${{ secrets.IMAGE_NAME }}:${{ secrets.IMAGE_TAG }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 567af37a84e1d31324af02427886754e9c6c1995..19f626aef3c0b77d1ce900ae0b37dce3c297aed1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,5 @@
 FROM openjdk:21-jdk-slim
 
-# Setup envs
-ARG PRODUCTION
-ARG JDBC_DATABASE_PASSWORD
-ARG JDBC_DATABASE_URL
-ARG JDBC_DATABASE_USERNAME
-ARG JDBC_STAGING_DATABASE_USERNAME
-ARG JDBC_STAGING_DATABASE_URL
-ARG JDBC_STAGING_DATABASE_URL
-
-ENV PRODUCTION ${PRODUCTION}
-ENV JDBC_DATABASE_PASSWORD ${JDBC_DATABASE_PASSWORD}
-ENV JDBC_DATABASE_URL ${JDBC_DATABASE_URL}
-ENV JDBC_DATABASE_USERNAME ${JDBC_DATABASE_USERNAME}
-ENV JDBC_STAGING_DATABASE_PASSWORD ${JDBC_STAGING_DATABASE_PASSWORD}
-ENV JDBC_STAGING_DATABASE_URL ${JDBC_STAGING_DATABASE_URL}
-ENV JDBC_STAGING_DATABASE_USERNAME ${JDBC_STAGING_DATABASE_USERNAME}
-
 WORKDIR /app
 COPY *.jar app.jar
 EXPOSE 8080