diff --git a/.github/workflows/dev-CD.yml b/.github/workflows/dev-CD.yml
index a2d2e00..221d026 100644
--- a/.github/workflows/dev-CD.yml
+++ b/.github/workflows/dev-CD.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   CI:
     runs-on: ubuntu-22.04
+    environment: dev
 
     steps:
       - name: Checkout
@@ -34,8 +35,8 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v2.2.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.DEV_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DEV_DOCKERHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v4
@@ -43,7 +44,7 @@ jobs:
           context: .
           file: ./Dockerfile-dev
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DEV_REPONAME }}
+          tags: ${{ secrets.DEV_DOCKERHUB_USERNAME }}/${{ secrets.DEV_REPONAME }}
 
   CD:
     needs: [CI]
diff --git a/.github/workflows/dev-CI.yml b/.github/workflows/dev-CI.yml
index eb491ea..9db0748 100644
--- a/.github/workflows/dev-CI.yml
+++ b/.github/workflows/dev-CI.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-22.04
+    environment: dev
 
     steps:
       - name: Checkout
@@ -26,4 +27,4 @@ jobs:
       - name: build with gradle
         run: |
           chmod +x gradlew
-          ./gradlew clean build -x test
+          ./gradlew clean build -x test
\ No newline at end of file
diff --git a/.github/workflows/prod-CD.yml b/.github/workflows/prod-CD.yml
index c5c51a1..9a0b543 100644
--- a/.github/workflows/prod-CD.yml
+++ b/.github/workflows/prod-CD.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   CI:
     runs-on: ubuntu-22.04
+    environment: prod
 
     steps:
       - name: Checkout
@@ -34,8 +35,8 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v2.2.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.PROD_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.PROD_DOCKERHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v4
@@ -43,7 +44,7 @@ jobs:
           context: .
           file: ./Dockerfile-prod
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.PROD_REPONAME }}
+          tags: ${{ secrets.PROD_DOCKERHUB_USERNAME }}/${{ secrets.PROD_REPONAME }}
 
   CD:
     needs: [CI]
diff --git a/.github/workflows/prod-CI.yml b/.github/workflows/prod-CI.yml
index 7e7116d..ecb9b77 100644
--- a/.github/workflows/prod-CI.yml
+++ b/.github/workflows/prod-CI.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-22.04
+    environment: prod
 
     steps:
       - name: Checkout