diff --git a/java/.gitlab-ci.yml b/java/.gitlab-ci.yml
index ca38f15..234d8bc 100644
--- a/java/.gitlab-ci.yml
+++ b/java/.gitlab-ci.yml
@@ -2,12 +2,13 @@
   stage: build
   script:
     - buildah info
-    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:java${JAVA_VERSION} -f java/Dockerfile.java${JAVA_VERSION} .
+    - buildah bud --storage-driver=${STORAGE_DRIVER} --pull -t ${FQ_IMAGE_NAME}:java${JAVA_VERSION} -f java/Dockerfile.java${JAVA_VERSION} .
     - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
     - buildah push ${FQ_IMAGE_NAME}:java${JAVA_VERSION}
   rules:
     - changes:
         - java/**
+        - Dockerfile.base
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
 
 build_java8:
diff --git a/php/.gitlab-ci.yml b/php/.gitlab-ci.yml
index d296322..893729a 100644
--- a/php/.gitlab-ci.yml
+++ b/php/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 .default_build_template: &build_template
   stage: build
-  needs: ["build_base"]
   script:
     - buildah info
     - buildah bud --storage-driver=${STORAGE_DRIVER} --pull -t ${FQ_IMAGE_NAME}:php${PHP_VERSION} -f php/Dockerfile.php${PHP_VERSION} .