diff --git a/.github/workflows/build-and-push-base-image.yaml b/.github/workflows/build-and-push-docker-base-image.yaml
similarity index 74%
rename from .github/workflows/build-and-push-base-image.yaml
rename to .github/workflows/build-and-push-docker-base-image.yaml
index 3ba7d17..895171e 100644
--- a/.github/workflows/build-and-push-base-image.yaml
+++ b/.github/workflows/build-and-push-docker-base-image.yaml
@@ -1,4 +1,4 @@
-name: Build and push base docker image
+name: Build and push Docker base image
 
 on:
   push:
@@ -8,10 +8,10 @@ on:
       - master
 
 env:
-  alpine_version: 3.15
+  ALPINE_VERSION: 3.15
 
 jobs:
-  build-and-push-base-image:
+  build-and-push-docker-base-image:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -37,8 +37,8 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           file: Dockerfile.base
           build_args:
-            - ALPINE_VERSION=${{ env.alpine_version }}
+            - ALPINE_VERSION=${{ env.ALPINE_VERSION }}
           push: true
           tags: |
-            ghcr.io/plankanban/planka:build-base-latest
-            ghcr.io/plankanban/planka:build-base-${{ env.alpine_version }}
+            ghcr.io/plankanban/planka:base-latest
+            ghcr.io/plankanban/planka:base-${{ env.ALPINE_VERSION }}
diff --git a/Dockerfile b/Dockerfile
index 81333ba..d36074a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN npm install npm@latest --global \
 COPY client .
 RUN npm run build
 
-FROM ghcr.io/plankanban/planka:build-base-3.15
+FROM ghcr.io/plankanban/planka:base-latest
 
 WORKDIR /app
 
diff --git a/Dockerfile.base b/Dockerfile.base
index 107a60e..1ef6b44 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -25,4 +25,4 @@ RUN apk -U upgrade \
   && make \
   && make install-strip \
   && rm -rf /tmp/vips-${VIPS_VERSION} \
-  && apk del vips-dependencies --purge
\ No newline at end of file
+  && apk del vips-dependencies --purge
diff --git a/package.json b/package.json
index b1b6397..69284ed 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,11 @@
     "client:lint": "npm run lint --prefix client",
     "client:start": "npm start --prefix client",
     "client:test": "npm test --prefix client",
+    "docker-build": "docker build -t ghcr.io/plankanban/planka:test -f Dockerfile .",
+    "docker-build-base": "docker build -t ghcr.io/plankanban/planka:base -f Dockerfile.base .",
     "postinstall": "npm i --prefix server && npm i --prefix client",
-    "prepare": "husky install",
     "lint": "npm run server:lint && npm run client:lint",
+    "prepare": "husky install",
     "server:console": "npm run console --prefix server",
     "server:db:init": "npm run db:init --prefix server",
     "server:db:migrate": "npm run db:migrate --prefix server",
@@ -26,9 +28,7 @@
     "server:start:prod": "npm run start:prod --prefix server",
     "server:test": "npm test --prefix server",
     "start": "concurrently -n server,client \"npm run server:start\" \"npm run client:start\"",
-    "test": "npm run server:test && npm run client:test",
-    "docker-build-base": "docker build -t ghcr.io/plankanban/planka:build-base -f Dockerfile.base .",
-    "docker-build": "docker build -t ghcr.io/plankanban/planka:test -f Dockerfile ."
+    "test": "npm run server:test && npm run client:test"
   },
   "lint-staged": {
     "client/**/*.{js,jsx}": [