diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index 4f1ab77ef5..98b9d228ff 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -163,7 +163,7 @@ jobs:
         --env APPSMITH_ENCRYPTION_PASSWORD=password \
         --env APPSMITH_ENCRYPTION_SALT=salt \
         --env APPSMITH_IS_SELF_HOSTED=false \
-        appsmith/appsmith-server-ee:release
+        appsmith/appsmith-server:release
 
     - name: Pull master server docker container and start it locally
       if: github.ref == 'refs/heads/master'
@@ -177,7 +177,7 @@ jobs:
         --env APPSMITH_ENCRYPTION_PASSWORD=password \
         --env APPSMITH_ENCRYPTION_SALT=salt \
         --env APPSMITH_IS_SELF_HOSTED=false \
-        appsmith/appsmith-server-ee:nightly
+        appsmith/appsmith-server:nightly
 
     - name: Installing Yarn serve
       run: |
@@ -271,15 +271,15 @@ jobs:
     - name: Push release image to Docker Hub
       if: success() && github.ref == 'refs/heads/release' && github.event_name == 'push'
       run: |
-        docker build -t appsmith/appsmith-editor-ee:${{steps.branch_name.outputs.tag}} .
+        docker build -t appsmith/appsmith-editor:${{steps.branch_name.outputs.tag}} .
         echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-        docker push appsmith/appsmith-editor-ee
+        docker push appsmith/appsmith-editor
     
     # Build master Docker image and push to Docker Hub
     - name: Push production image to Docker Hub with commit tag
       if: success() && github.ref == 'refs/heads/master' && github.event_name == 'push'
       run: |
-        docker build -t appsmith/appsmith-editor-ee:${GITHUB_SHA} .
-        docker build -t appsmith/appsmith-editor-ee:nightly .
+        docker build -t appsmith/appsmith-editor:${GITHUB_SHA} .
+        docker build -t appsmith/appsmith-editor:nightly .
         echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-        docker push appsmith/appsmith-editor-ee
\ No newline at end of file
+        docker push appsmith/appsmith-editor
\ No newline at end of file
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index 48d28d8503..919006d047 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -71,22 +71,22 @@ jobs:
     - name: Push release image to Docker Hub
       if: success() && github.ref == 'refs/heads/release'
       run: |
-        docker build -t appsmith/appsmith-server-ee:${{steps.vars.outputs.tag}} .
+        docker build -t appsmith/appsmith-server:${{steps.vars.outputs.tag}} .
         echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
         # This command pushes all the tags on the machine to Docker hub. This has been written for ease of reading. Be very careful 
         # with this command
-        docker push appsmith/appsmith-server-ee
+        docker push appsmith/appsmith-server
 
     # Build master Docker image and push to Docker Hub
     - name: Push master image to Docker Hub with commit tag
       if: success() && github.ref == 'refs/heads/master'
       run: |
-        docker build -t appsmith/appsmith-server-ee:${GITHUB_SHA} .
-        docker build -t appsmith/appsmith-server-ee:nightly .
+        docker build -t appsmith/appsmith-server:${GITHUB_SHA} .
+        docker build -t appsmith/appsmith-server:nightly .
         echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
         # This command pushes all the tags on the machine to Docker hub. This has been written for ease of reading. Be very careful 
         # with this command
-        docker push appsmith/appsmith-server-ee
+        docker push appsmith/appsmith-server
   
   # These are dummy jobs in the CI build to satisfy required status checks for merging PRs. This is a hack because Github doesn't support conditional 
   # required checks in monorepos. These jobs are a clone of similarly named jobs in client.yml.