diff --git a/.github/workflows/Deploy-docker.yml b/.github/workflows/Deploy-docker.yml
index 3c6e984..6317fcf 100644
--- a/.github/workflows/Deploy-docker.yml
+++ b/.github/workflows/Deploy-docker.yml
@@ -6,22 +6,22 @@ on:
   pull_request:
     branches: [ "master" ]
 
-env:
-  JWT_SECRET: ${{secrets.jwt_secret}}
-  POSTGRES_HOST: 192.168.1.200
-  POSTGRES_PORT: 5099
-  POSTGRES_USER: postgres
-  POSTGRES_DB: portfolio
-  POSTGRES_PASSWORD: ${{secrets.database_password}}
-  SSL_MODE: true
-  ENVIRONMENT: docker
-
 jobs:
 
   build:
 
     runs-on: ubuntu-latest
 
+    env:
+      JWT_SECRET: ${{secrets.jwt_secret}}
+      POSTGRES_HOST: 192.168.1.200
+      POSTGRES_PORT: 5099
+      POSTGRES_USER: postgres
+      POSTGRES_DB: portfolio
+      POSTGRES_PASSWORD: ${{secrets.database_password}}
+      SSL_MODE: true
+      ENVIRONMENT: docker
+
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
diff --git a/docker-compose.yml b/docker-compose.yml
index f899e6f..ecaeafd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,14 +5,14 @@ services:
     container_name: darius-portfolio-server
     build: .
     environment:
-      - JWT_SECRET=${JWT_SECRET}
-      - POSTGRES_HOST=${POSTGRES_HOST}
-      - POSTGRES_PORT=${POSTGRES_PORT}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - SSL_MODE=${SSL_MODE}
-      - ENVIRONMENT=${ENVIRONMENT}
+      - JWT_SECRET
+      - POSTGRES_HOST
+      - POSTGRES_PORT
+      - POSTGRES_USER
+      - POSTGRES_DB
+      - POSTGRES_PASSWORD
+      - SSL_MODE
+      - ENVIRONMENT
     ports:
       - "4000:4000"
       - "4001:4001"