diff --git a/.github/workflows/shared-ext-ci-workflow.yml b/.github/workflows/shared-ext-ci-workflow.yml
index aa1af5c..48b7db2 100644
--- a/.github/workflows/shared-ext-ci-workflow.yml
+++ b/.github/workflows/shared-ext-ci-workflow.yml
@@ -181,7 +181,7 @@ jobs:
       - name: Post job - cleanup pip config
         if: ${{ always() }}
         run: |
-          rm ${{ github.workspace }}/.pip.conf
+          rm -f ${{ github.workspace }}/.pip.conf
 
   DeployPages:
     name: Deploy Pages
diff --git a/static-commontooling/docker/Dockerfile_multi_macros.j2 b/static-commontooling/docker/Dockerfile_multi_macros.j2
index 42e064b..9fd3eb7 100644
--- a/static-commontooling/docker/Dockerfile_multi_macros.j2
+++ b/static-commontooling/docker/Dockerfile_multi_macros.j2
@@ -11,7 +11,7 @@ ARG CLOUDFIT_BASE_LABEL=latest
 ###############################################################################
 # Stage: api - Alias for api specification layer
 ###############################################################################
-FROM {{ apimodname }}:${BUILD_TAG} as api
+FROM {{ apimodname }}:${BUILD_TAG} AS api
 {%- endmacro %}
 
 
@@ -242,7 +242,7 @@ CMD [ \
 ###############################################################################
 # Stage: alembic - The alembic DB migration tool configured for this layer
 ###############################################################################
-FROM ap-docker.artifactory.labs.bbc/cloudfit/alembic:latest as alembic_base
+FROM ap-docker.artifactory.labs.bbc/cloudfit/alembic:latest AS alembic_base
 
 FROM layer AS alembic