diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0d8aad735ab5b7e5c6f3bb5e3adb8783c801a32..1657a1e1a6802b8af23b28af1682644180b4cc33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -338,13 +338,13 @@ package:nightly:arch:
   <<: *release_nightly
   extends: .package:arch
   before_script:
-    - cd extra/distro/arch/nightly/
+    - cp extra/distro/arch/nightly/PKGBUILD .
 
 package:tag:arch:
   <<: *release_tag
   extends: .package:arch
   before_script:
-    - cd extra/distro/arch/release/
+    - cp extra/distro/arch/release/PKGBUILD .
 
 # -----------------------------------------------------------------------------
 
@@ -369,8 +369,7 @@ release:tag:arch:
 
 # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 # release_docker.yml
-.package:docker:
-  extends: .template:package
+.template:docker: &docker
   image: alpine:3.9
   cache: {}  # disable
   services:
@@ -395,7 +394,8 @@ release:tag:arch:
 
 package:nightly:docker:
   <<: *release_nightly
-  extends: .package:docker
+  <<: *docker
+  extends: .template:package
   script:
     - docker build --target=deploy-cli -f extra/docker/Dockerfile.master -t "$IMAGE_CLI:$TAG_NIGHTLY" .
     - docker build --target=deploy-all -f extra/docker/Dockerfile.master -t "$IMAGE_ALL:$TAG_NIGHTLY" .
@@ -411,7 +411,8 @@ package:nightly:docker:
 
 package:tag:docker:
   <<: *release_tag
-  extends: .package:docker
+  <<: *docker
+  extends: .template:package
   script:
     - docker build --target=deploy-cli -f extra/docker/Dockerfile.master -t "$IMAGE_CLI:$TAG_NIGHTLY" .
     - docker build --target=deploy-all -f extra/docker/Dockerfile.master -t "$IMAGE_ALL:$TAG_NIGHTLY" .
@@ -430,6 +431,7 @@ package:tag:docker:
 
 release:nightly:docker:
   <<: *release_nightly
+  <<: *docker
   extends: .template:release
   environment:
     name: docker-nightly
@@ -444,6 +446,7 @@ release:nightly:docker:
 
 release:tag:docker:
   <<: *release_tag
+  <<: *docker
   extends: .template:release
   environment:
     name: docker-release