diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 333245f0a..8ca1d7f63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,20 +36,33 @@ stages:
           --cache-to type=inline
           ${BUILD_CONTEXT}
 
+#  note: CI_REGISTRY, etc. variables are privileged
+#
 # .build-branch:
 #   image:
-#     name: ${CI_KANIKO_IMAGE}
-#     entrypoint: [""] # kaniko doesn't have /bin/sh
+#     name: ${CI_DOCKER_IMAGE}
 #   stage: build
 #   rules:
+#     - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != "web"
+#       changes:
+#         - '**/*.php'
+#         - '**/*.js'
+#         - '.docker/**/*'
 #     - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+#       when: manual
+#   before_script:
+#       - docker buildx create --name mp-builder --driver docker-container --bootstrap --use
+#       - CONTAINER_NAME=$(echo ${CI_JOB_NAME} | sed 's/branch://')
 #   script:
-#       - /kaniko/executor
-#         --context "${BUILD_CONTEXT}"
-#         --dockerfile "${DOCKER_DIR}/Dockerfile"
-#         --destination "${CI_REGISTRY}/cthulhoo/${NAME}:${CI_COMMIT_BRANCH}-latest"
-#         --destination "${CI_REGISTRY}/cthulhoo/${NAME}:${CI_COMMIT_BRANCH}-${CI_COMMIT_SHORT_SHA}"
-#         --no-push
+#       - docker buildx build
+#           --push
+#           --platform linux/amd64
+#           --tag ${CI_REGISTRY}/cthulhoo/$CONTAINER_NAME:${CI_COMMIT_BRANCH}-${CI_COMMIT_SHORT_SHA}
+#           --tag ${CI_REGISTRY}/cthulhoo/$CONTAINER_NAME:${CI_COMMIT_BRANCH}
+#           --build-context app-src=.
+#           --cache-from type=registry,ref=${CI_REGISTRY}/cthulhoo/$CONTAINER_NAME:${CI_COMMIT_BRANCH}
+#           --cache-to type=inline
+#           ${BUILD_CONTEXT}
 
 phpunit:
   image:
@@ -109,6 +122,16 @@ ttrss-fpm-pgsql-static:
    variables:
      BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app
 
+# branch:ttrss-web-nginx:
+#   extends: .build-branch
+#   variables:
+#     BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx
+
+# branch:ttrss-fpm-pgsql-static:
+#    extends: .build-branch
+#    variables:
+#      BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app
+
 phpdoc:
   image:
     name: ${CI_DOCKER_IMAGE}