diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index c41a33e4..9c49475a 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -14,7 +14,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ckan-spatial
-  TAG: ghcr.io/${{ github.repository }}:${{ github.head_ref }}
+  TAG: ghcr.io/ckan-spatial::${{ github.head_ref }}
   CONTEXT: .
   BRANCH: ${{ github.head_ref }}
   DOCKERFILE_PATH: /ckan
diff --git a/.github/workflows/docker-manual.yml b/.github/workflows/docker-manual.yml
index 31c47047..5d40199f 100644
--- a/.github/workflows/docker-manual.yml
+++ b/.github/workflows/docker-manual.yml
@@ -5,7 +5,7 @@ on: workflow_dispatch
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ckan-spatial
-  TAG: ghcr.io/${{ github.repository }}:${{ github.ref_name }}
+  TAG: ghcr.io/ckan-spatial:${{ github.ref_name }}
   CONTEXT: .
   BRANCH: ${{ github.ref_name }}
   DOCKERFILE_PATH: /ckan
diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev
index c87c3ad0..4ec5c849 100644
--- a/ckan/Dockerfile.dev
+++ b/ckan/Dockerfile.dev
@@ -1,13 +1,9 @@
 FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.9-dev
-LABEL maintainer="mnl.janez@gmail.com"
 
 # Set up environment variables
-ENV APP_DIR=/srv/app
-ENV TZ=UTC
-ENV SRC_EXTENSIONS_DIR=/srv/app/src_extensions
-
-# Set working directory
-WORKDIR ${APP_DIR}
+ENV APP_DIR=/srv/app \
+    TZ=UTC \
+    SRC_EXTENSIONS_DIR=/srv/app/src_extensions
 
 RUN echo ${TZ} > /etc/timezone && \
     set -ex && apk --no-cache add sudo && \
@@ -51,18 +47,18 @@ RUN echo ${TZ} > /etc/timezone && \
 # to get them mounted in this image at runtime
 
 # Used to configure the container environment by setting environment variables, creating users, running initialization scripts, .etc
-COPY docker-entrypoint.d/* docker-entrypoint.d/
+COPY docker-entrypoint.d/* /docker-entrypoint.d/
 
 # Update who.ini with PROXY_CKAN_LOCATION
-COPY setup/who.ini ./
+COPY setup/who.ini ${APP_DIR}/
 
 # Override start_ckan.sh with DEV sh
-COPY setup/start_ckan_development.sh.override start_ckan_development.sh
-RUN chmod +x start_ckan_development.sh
+COPY setup/start_ckan_development.sh.override ${APP_DIR}/start_ckan_development.sh
+RUN chmod +x ${APP_DIR}/start_ckan_development.sh
 
 # Apply any patches needed to CKAN core or any of the built extensions (not the
-# runtime mounted ones!)
-COPY patches patches
+# runtime mounted ones)
+COPY patches ${APP_DIR}/patches
 
 RUN for d in $APP_DIR/patches/*; do \
     if [ -d $d ]; then \