diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3ab6c727aa8f296a88f05e288efe16ec9b9d76b..1bafcfc26ab26d66332d6750859dabb3fc64ee35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,10 +107,10 @@ aggregate-docs:
 # that replace the previous value.
 
 .bitbake-workspace:
-  extends: [.workspace, .workspace-rules]
+  extends: [.workspace-rules, .workspace]
 
 .build-rauc-bundle:
-  extends: [.build-image, .workspace-rules]
+  extends: [.workspace-rules, .build-image]
 
 .publish-rauc-bundle-to-hawkbit:
   extends: [.workspace-rules]