diff --git a/server/dev/build b/server/dev/build
index faddfc0b..0522631c 100755
--- a/server/dev/build
+++ b/server/dev/build
@@ -9,10 +9,10 @@ GIT_COMMIT=`git rev-parse --short HEAD`
 GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
 
 echo "Building server image"
-docker build -t neko_server --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../Dockerfile ..
+docker build -t neko_server:src -f ../Dockerfile ..
 
 echo "Building base image"
-../../build -y -b neko_server -t base -f "$1"
+../../build -y -b neko_server:base -f "$1"
 
 echo "Building app image"
 docker build -t neko_server:app --build-arg "BASE_IMAGE=neko_server:base" -f ./runtime/Dockerfile ./runtime
diff --git a/server/dev/fmt b/server/dev/fmt
index f8b3130e..a294473e 100755
--- a/server/dev/fmt
+++ b/server/dev/fmt
@@ -1,12 +1,12 @@
 #!/bin/bash
 cd "$(dirname "$0")"
 
-if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
-    echo "Image 'neko_server' not found. Run ./build first."
+if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
+    echo "Image 'neko_server:src' not found. Run ./build first."
     exit 1
 fi
 
 docker run -it --rm \
     --entrypoint="go" \
     -v "${PWD}/../:/src" \
-    neko_server fmt ./...
+    neko_server:src fmt ./...
diff --git a/server/dev/go b/server/dev/go
index 29a62e91..229a9365 100755
--- a/server/dev/go
+++ b/server/dev/go
@@ -1,8 +1,8 @@
 #!/bin/bash
 cd "$(dirname "$0")"
 
-if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
-    echo "Image 'neko_server' not found. Run ./build first."
+if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
+    echo "Image 'neko_server:src' not found. Run ./build first."
     exit 1
 fi
 
@@ -10,7 +10,7 @@ docker run -it \
     --name "neko_server_go" \
     --entrypoint="go" \
     -v "${PWD}/../:/src" \
-    neko_server "$@";
+    neko_server:src "$@";
 #
 # copy package files
 docker cp neko_server_go:/src/go.mod "../go.mod"
diff --git a/server/dev/lint b/server/dev/lint
index c0f0b5bb..0c9e9bed 100755
--- a/server/dev/lint
+++ b/server/dev/lint
@@ -1,8 +1,8 @@
 #!/bin/bash
 cd "$(dirname "$0")"
 
-if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
-    echo "Image 'neko_server' not found. Run ./build first."
+if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
+    echo "Image 'neko_server:src' not found. Run ./build first."
     exit 1
 fi
 
@@ -11,4 +11,4 @@ fi
 docker run --rm -it \
     -v "${PWD}/../:/src" \
     --entrypoint="/bin/bash" \
-    neko_server -c '[ -f ./bin/golangci-lint ] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.31.0;./bin/golangci-lint run';
+    neko_server:src -c '[ -f ./bin/golangci-lint ] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.31.0;./bin/golangci-lint run';
diff --git a/server/dev/rebuild b/server/dev/rebuild
index d2132fe7..696af7aa 100755
--- a/server/dev/rebuild
+++ b/server/dev/rebuild
@@ -10,7 +10,7 @@ set -e
 docker run --rm -it \
     -v "${PWD}/../:/src" \
     --entrypoint="/bin/bash" \
-    neko_server "./build" "$@";
+    neko_server:src "./build" "$@";
 
 #
 # remove old plugins