diff --git a/polkadot/.gitattributes b/polkadot/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..2ea1ab2d6b9cff5f075666eb5a780575870c221e
--- /dev/null
+++ b/polkadot/.gitattributes
@@ -0,0 +1,2 @@
+/.gitlab-ci.yml filter=ci-prettier
+/scripts/ci/gitlab/pipeline/*.yml filter=ci-prettier
diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml
index 6d9300ba93a06c2d9819d35e7059a5b8b0df282e..9da8680c62ffd56d828589371d87bf8e0aa70720 100644
--- a/polkadot/.gitlab-ci.yml
+++ b/polkadot/.gitlab-ci.yml
@@ -29,38 +29,38 @@ workflow:
     - if: $CI_COMMIT_BRANCH
 
 variables:
-  GIT_STRATEGY:                    fetch
-  GIT_DEPTH:                       100
-  CI_SERVER_NAME:                  "GitLab CI"
-  CI_IMAGE:                        "paritytech/ci-linux:production"
-  BUILDAH_IMAGE:                   "quay.io/buildah/stable:v1.27"
-  DOCKER_OS:                       "debian:stretch"
-  ARCH:                            "x86_64"
-  ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.78"
+  GIT_STRATEGY: fetch
+  GIT_DEPTH: 100
+  CI_SERVER_NAME: "GitLab CI"
+  CI_IMAGE: "paritytech/ci-linux:production"
+  BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
+  DOCKER_OS: "debian:stretch"
+  ARCH: "x86_64"
+  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.78"
 
 default:
-  cache:                           {}
+  cache: {}
   retry:
     max: 2
     when:
       - runner_system_failure
       - unknown_failure
       - api_failure
-  interruptible:                   true
+  interruptible: true
 
 .collect-artifacts:
   artifacts:
-    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when:                          on_success
-    expire_in:                     7 days
+    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
+    when: on_success
+    expire_in: 7 days
     paths:
       - ./artifacts/
 
 .collect-artifacts-short:
   artifacts:
-    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when:                          on_success
-    expire_in:                     1 days
+    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
+    when: on_success
+    expire_in: 1 days
     paths:
       - ./artifacts/
 
@@ -76,22 +76,22 @@ default:
 
 .pipeline-stopper-artifacts:
   artifacts:
-     reports:
-       dotenv: pipeline-stopper.env
+    reports:
+      dotenv: pipeline-stopper.env
 
 .job-switcher:
   before_script:
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 
 .kubernetes-env:
-  image:                           "${CI_IMAGE}"
+  image: "${CI_IMAGE}"
   before_script:
     - !reference [.job-switcher, before_script]
   tags:
     - kubernetes-parity-build
 
 .docker-env:
-  image:                           "${CI_IMAGE}"
+  image: "${CI_IMAGE}"
   before_script:
     - !reference [.job-switcher, before_script]
   tags:
@@ -108,7 +108,7 @@ default:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
 
 .common-refs:
   # these jobs run always*
@@ -116,15 +116,15 @@ default:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/      # i.e. release-v0.9.27
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
+    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
 
 .test-pr-refs:
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
 
 .zombienet-refs:
   rules:
@@ -133,7 +133,7 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: never
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
 
 .deploy-testnet-refs:
   rules:
@@ -148,9 +148,9 @@ default:
       when: never
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_PIPELINE_SOURCE == "web" &&
-          $CI_COMMIT_REF_NAME == "master"
+        $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
 
 .build-push-image:
   before_script:
@@ -162,19 +162,19 @@ default:
     - echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
   script:
     - test "$DOCKER_USER" -a "$DOCKER_PASS" ||
-        ( echo "no docker credentials provided"; exit 1 )
+      ( echo "no docker credentials provided"; exit 1 )
     - cd ./artifacts
     - buildah bud
-        --format=docker
-        --build-arg VCS_REF="${CI_COMMIT_SHA}"
-        --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-        --build-arg IMAGE_NAME="${IMAGE_NAME}"
-        --tag "$IMAGE_NAME:$VERSION"
-        --tag "$IMAGE_NAME:$EXTRATAG"
-        --file ${DOCKERFILE} .
+      --format=docker
+      --build-arg VCS_REF="${CI_COMMIT_SHA}"
+      --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
+      --build-arg IMAGE_NAME="${IMAGE_NAME}"
+      --tag "$IMAGE_NAME:$VERSION"
+      --tag "$IMAGE_NAME:$EXTRATAG"
+      --file ${DOCKERFILE} .
     # The job will success only on the protected branch
     - echo "$DOCKER_PASS" |
-        buildah login --username "$DOCKER_USER" --password-stdin docker.io
+      buildah login --username "$DOCKER_USER" --password-stdin docker.io
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:$EXTRATAG"
@@ -200,50 +200,49 @@ include:
 #### stage:                        .post
 
 deploy-parity-testnet:
-  stage:                           .post
+  stage: .post
   extends:
     - .deploy-testnet-refs
   variables:
-    POLKADOT_CI_COMMIT_NAME:       "${CI_COMMIT_REF_NAME}"
-    POLKADOT_CI_COMMIT_REF:        "${CI_COMMIT_SHORT_SHA}"
-  allow_failure:                   false
-  trigger:                         "parity/infrastructure/parity-testnet"
+    POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
+    POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
+  allow_failure: false
+  trigger: "parity/infrastructure/parity-testnet"
 
 # This job cancels the whole pipeline if any of provided jobs fail.
 # In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
 # to fail the pipeline as soon as possible to shorten the feedback loop.
 .cancel-pipeline-template:
-  stage:                           .post
+  stage: .post
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
       when: on_failure
   variables:
-    PROJECT_ID:                    "${CI_PROJECT_ID}"
-    PROJECT_NAME:                  "${CI_PROJECT_NAME}"
-    PIPELINE_ID:                   "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL:                "${FAILED_JOB_URL}"
-    FAILED_JOB_NAME:               "${FAILED_JOB_NAME}"
-    PR_NUM:                        "${PR_NUM}"
+    PROJECT_ID: "${CI_PROJECT_ID}"
+    PROJECT_NAME: "${CI_PROJECT_NAME}"
+    PIPELINE_ID: "${CI_PIPELINE_ID}"
+    FAILED_JOB_URL: "${FAILED_JOB_URL}"
+    FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
+    PR_NUM: "${PR_NUM}"
   trigger:
-    project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
-    branch:                        "as-improve"
+    project: "parity/infrastructure/ci_cd/pipeline-stopper"
+    branch: "as-improve"
 
 remove-cancel-pipeline-message:
   stage: .post
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
   variables:
-    PROJECT_ID:                    "${CI_PROJECT_ID}"
-    PROJECT_NAME:                  "${CI_PROJECT_NAME}"
-    PIPELINE_ID:                   "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL:                "https://gitlab.com"
-    FAILED_JOB_NAME:               "nope"
-    PR_NUM:                        "${CI_COMMIT_REF_NAME}"
+    PROJECT_ID: "${CI_PROJECT_ID}"
+    PROJECT_NAME: "${CI_PROJECT_NAME}"
+    PIPELINE_ID: "${CI_PIPELINE_ID}"
+    FAILED_JOB_URL: "https://gitlab.com"
+    FAILED_JOB_NAME: "nope"
+    PR_NUM: "${CI_COMMIT_REF_NAME}"
   trigger:
-    project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
+    project: "parity/infrastructure/ci_cd/pipeline-stopper"
 
 cancel-pipeline-test-linux-stable:
-  extends:                         .cancel-pipeline-template
+  extends: .cancel-pipeline-template
   needs:
-    - job:                         test-linux-stable
-
+    - job: test-linux-stable
diff --git a/polkadot/scripts/ci/gitlab/pipeline/build.yml b/polkadot/scripts/ci/gitlab/pipeline/build.yml
index 38b47942f1de4bae08592da597248e5b98f4deff..201b76afe79ba331c891be7b680ed79ece9d781d 100644
--- a/polkadot/scripts/ci/gitlab/pipeline/build.yml
+++ b/polkadot/scripts/ci/gitlab/pipeline/build.yml
@@ -2,12 +2,12 @@
 # Here are all jobs that are executed during "build" stage
 
 build-linux-stable:
-  stage:                           build
+  stage: build
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in check.yml
   needs:
-    - job:                         job-starter
-      artifacts:                   false
+    - job: job-starter
+      artifacts: false
   extends:
     - .docker-env
     - .common-refs
@@ -40,12 +40,12 @@ build-linux-stable:
     - cp -r scripts/* ./artifacts
 
 build-test-collators:
-  stage:                           build
+  stage: build
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in check.yml
   needs:
-    - job:                         job-starter
-      artifacts:                   false
+    - job: job-starter
+      artifacts: false
   extends:
     - .docker-env
     - .common-refs
@@ -65,12 +65,12 @@ build-test-collators:
     - cp -r ./scripts/* ./artifacts
 
 build-malus:
-  stage:                           build
+  stage: build
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in check.yml
   needs:
-    - job:                         job-starter
-      artifacts:                   false
+    - job: job-starter
+      artifacts: false
   extends:
     - .docker-env
     - .common-refs
@@ -87,12 +87,12 @@ build-malus:
     - cp -r ./scripts/* ./artifacts
 
 build-staking-miner:
-  stage:                           build
+  stage: build
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in check.yml
   needs:
-    - job:                         job-starter
-      artifacts:                   false
+    - job: job-starter
+      artifacts: false
   extends:
     - .docker-env
     - .common-refs
@@ -109,23 +109,23 @@ build-staking-miner:
     - cp -r ./scripts/* ./artifacts
 
 build-rustdoc:
-  stage:                           build
+  stage: build
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in test.yml
   needs:
-    - job:                         test-deterministic-wasm
-      artifacts:                   false
+    - job: test-deterministic-wasm
+      artifacts: false
   extends:
     - .docker-env
     - .test-refs
   variables:
-    SKIP_WASM_BUILD:               1
+    SKIP_WASM_BUILD: 1
   artifacts:
-    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
-    when:                          on_success
-    expire_in:                     1 days
+    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
+    when: on_success
+    expire_in: 1 days
     paths:
-    - ./crate-docs/
+      - ./crate-docs/
   script:
     # FIXME: it fails with `RUSTDOCFLAGS="-Dwarnings"` and `--all-features`
     # FIXME: return to stable when https://github.com/rust-lang/rust/issues/96937 gets into stable
@@ -137,33 +137,33 @@ build-rustdoc:
     - echo "<meta http-equiv=refresh content=0;url=polkadot_service/index.html>" > ./crate-docs/index.html
 
 build-implementers-guide:
-  stage:                           build
+  stage: build
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in test.yml
   needs:
-    - job:                         test-deterministic-wasm
-      artifacts:                   false
+    - job: test-deterministic-wasm
+      artifacts: false
   extends:
     - .kubernetes-env
     - .test-refs
     - .collect-artifacts-short
   # git depth is set on purpose: https://github.com/paritytech/polkadot/issues/6284
   variables:
-    GIT_STRATEGY:                  clone
-    GIT_DEPTH:                     0
-    CI_IMAGE:                      paritytech/mdbook-utils:e14aae4a-20221123
+    GIT_STRATEGY: clone
+    GIT_DEPTH: 0
+    CI_IMAGE: paritytech/mdbook-utils:e14aae4a-20221123
   script:
     - mdbook build ./roadmap/implementers-guide
     - mkdir -p artifacts
     - mv roadmap/implementers-guide/book artifacts/
 
 build-short-benchmark:
-  stage:                           build
+  stage: build
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in check.yml
   needs:
-    - job:                         job-starter
-      artifacts:                   false
+    - job: job-starter
+      artifacts: false
   extends:
     - .docker-env
     - .test-refs
diff --git a/polkadot/scripts/ci/gitlab/pipeline/check.yml b/polkadot/scripts/ci/gitlab/pipeline/check.yml
index 19d4bfcededf7ecbfbc3b862e9d549287cc13359..66338ba21c849a2d07c2ad3ba397c737f91f19b7 100644
--- a/polkadot/scripts/ci/gitlab/pipeline/check.yml
+++ b/polkadot/scripts/ci/gitlab/pipeline/check.yml
@@ -2,31 +2,31 @@
 # Here are all jobs that are executed during "check" stage
 
 check-runtime:
-  stage:                           check
-  image:                           paritytech/tools:latest
+  stage: check
+  image: paritytech/tools:latest
   extends:
     - .kubernetes-env
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/      # i.e. release-v0.9.27
+    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
   variables:
-    GITLAB_API:                    "https://gitlab.parity.io/api/v4"
-    GITHUB_API_PROJECT:            "parity%2Finfrastructure%2Fgithub-api"
+    GITLAB_API: "https://gitlab.parity.io/api/v4"
+    GITHUB_API_PROJECT: "parity%2Finfrastructure%2Fgithub-api"
   script:
     - ./scripts/ci/gitlab/check_runtime.sh
-  allow_failure:                   true
+  allow_failure: true
 
 cargo-fmt:
-  stage:                           check
+  stage: check
   extends:
     - .docker-env
     - .test-refs
   script:
     - cargo +nightly --version
     - cargo +nightly fmt --all -- --check
-  allow_failure:                   true
+  allow_failure: true
 
 spellcheck:
-  stage:                           check
+  stage: check
   extends:
     - .docker-env
     - .test-refs
@@ -37,11 +37,11 @@ spellcheck:
     - echo "___Spellcheck is going to check your diff___"
     - cargo spellcheck list-files -vvv $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges))
     - time cargo spellcheck check -vvv --cfg=scripts/ci/gitlab/spellcheck.toml --checkers hunspell --code 1
-        $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges))
-  allow_failure:                   true
+      $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges))
+  allow_failure: true
 
 check-try-runtime:
-  stage:                           check
+  stage: check
   extends:
     - .docker-env
     - .test-refs
@@ -53,7 +53,7 @@ check-try-runtime:
 # More info can be found here: https://github.com/paritytech/polkadot/pull/5865
 # Works only in PRs with E1 label
 .check-runtime-migration:
-  stage:                           check
+  stage: check
   extends:
     - .docker-env
     - .test-pr-refs
@@ -79,39 +79,39 @@ check-try-runtime:
       fi
 
 check-runtime-migration-polkadot:
-  stage:                           check
+  stage: check
   extends:
     - .docker-env
     - .test-pr-refs
     - .compiler-info
     - .check-runtime-migration
   variables:
-    NETWORK:                       "polkadot"
+    NETWORK: "polkadot"
 
 check-runtime-migration-kusama:
-  stage:                           check
+  stage: check
   extends:
     - .docker-env
     - .test-pr-refs
     - .compiler-info
     - .check-runtime-migration
   variables:
-    NETWORK:                       "kusama"
+    NETWORK: "kusama"
 
 check-runtime-migration-westend:
-  stage:                           check
+  stage: check
   extends:
     - .docker-env
     - .test-pr-refs
     - .compiler-info
     - .check-runtime-migration
   variables:
-    NETWORK:                       "westend"
-  allow_failure:                   true
+    NETWORK: "westend"
+  allow_failure: true
 
 # is broken, need to fix
 check-no-default-features:
-  stage:                           check
+  stage: check
   extends:
     - .docker-env
     - .test-refs
@@ -124,8 +124,8 @@ check-no-default-features:
 
 # this is artificial job to run some build and tests using DAG
 job-starter:
-  stage:                           check
-  image:                           paritytech/tools:latest
+  stage: check
+  image: paritytech/tools:latest
   extends:
     - .kubernetes-env
     - .common-refs
diff --git a/polkadot/scripts/ci/gitlab/pipeline/publish.yml b/polkadot/scripts/ci/gitlab/pipeline/publish.yml
index abd247669854f010ea9c1473ada836b54ac04835..27fb51c7a19747a002810caa0de96098168ae01b 100644
--- a/polkadot/scripts/ci/gitlab/pipeline/publish.yml
+++ b/polkadot/scripts/ci/gitlab/pipeline/publish.yml
@@ -5,7 +5,7 @@
 # Release image is handled by the Github Action here:
 # .github/workflows/publish-docker-release.yml
 publish-polkadot-debug-image:
-  stage:                           publish
+  stage: publish
   extends:
     - .kubernetes-env
     - .build-push-image
@@ -16,19 +16,19 @@ publish-polkadot-debug-image:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
   variables:
-    CI_IMAGE:                      ${BUILDAH_IMAGE}
-    GIT_STRATEGY:                  none
-    DOCKER_USER:                   ${PARITYPR_USER}
-    DOCKER_PASS:                   ${PARITYPR_PASS}
+    CI_IMAGE: ${BUILDAH_IMAGE}
+    GIT_STRATEGY: none
+    DOCKER_USER: ${PARITYPR_USER}
+    DOCKER_PASS: ${PARITYPR_PASS}
     # scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile
-    DOCKERFILE:                    ci/dockerfiles/polkadot_injected_debug.Dockerfile
-    IMAGE_NAME:                    docker.io/paritypr/polkadot-debug
+    DOCKERFILE: ci/dockerfiles/polkadot_injected_debug.Dockerfile
+    IMAGE_NAME: docker.io/paritypr/polkadot-debug
   needs:
-    - job:                         build-linux-stable
-      artifacts:                   true
+    - job: build-linux-stable
+      artifacts: true
   after_script:
     # pass artifacts to the zombienet-tests job
     # https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#with-variable-inheritance
@@ -38,26 +38,26 @@ publish-polkadot-debug-image:
     reports:
       # this artifact is used in zombienet-tests job
       dotenv: ./artifacts/parachains.env
-    expire_in:                     1 days
+    expire_in: 1 days
 
 publish-test-collators-image:
   # service image for Simnet
-  stage:                           publish
+  stage: publish
   extends:
     - .kubernetes-env
     - .build-push-image
     - .zombienet-refs
   variables:
-    CI_IMAGE:                      ${BUILDAH_IMAGE}
-    GIT_STRATEGY:                  none
-    DOCKER_USER:                   ${PARITYPR_USER}
-    DOCKER_PASS:                   ${PARITYPR_PASS}
+    CI_IMAGE: ${BUILDAH_IMAGE}
+    GIT_STRATEGY: none
+    DOCKER_USER: ${PARITYPR_USER}
+    DOCKER_PASS: ${PARITYPR_PASS}
     # scripts/ci/dockerfiles/collator_injected.Dockerfile
-    DOCKERFILE:                    ci/dockerfiles/collator_injected.Dockerfile
-    IMAGE_NAME:                    docker.io/paritypr/colander
+    DOCKERFILE: ci/dockerfiles/collator_injected.Dockerfile
+    IMAGE_NAME: docker.io/paritypr/colander
   needs:
-    - job:                         build-test-collators
-      artifacts:                   true
+    - job: build-test-collators
+      artifacts: true
   after_script:
     - buildah logout --all
     # pass artifacts to the zombienet-tests job
@@ -70,22 +70,22 @@ publish-test-collators-image:
 
 publish-malus-image:
   # service image for Simnet
-  stage:                           publish
+  stage: publish
   extends:
     - .kubernetes-env
     - .build-push-image
     - .zombienet-refs
   variables:
-    CI_IMAGE:                      ${BUILDAH_IMAGE}
-    GIT_STRATEGY:                  none
-    DOCKER_USER:                   ${PARITYPR_USER}
-    DOCKER_PASS:                   ${PARITYPR_PASS}
+    CI_IMAGE: ${BUILDAH_IMAGE}
+    GIT_STRATEGY: none
+    DOCKER_USER: ${PARITYPR_USER}
+    DOCKER_PASS: ${PARITYPR_PASS}
     # scripts/ci/dockerfiles/malus_injected.Dockerfile
-    DOCKERFILE:                    ci/dockerfiles/malus_injected.Dockerfile
-    IMAGE_NAME:                    docker.io/paritypr/malus
+    DOCKERFILE: ci/dockerfiles/malus_injected.Dockerfile
+    IMAGE_NAME: docker.io/paritypr/malus
   needs:
-    - job:                         build-malus
-      artifacts:                   true
+    - job: build-malus
+      artifacts: true
   after_script:
     - buildah logout "$IMAGE_NAME"
     # pass artifacts to the zombienet-tests job
@@ -97,35 +97,34 @@ publish-malus-image:
       dotenv: ./artifacts/malus.env
 
 publish-staking-miner-image:
-  stage:                           publish
+  stage: publish
   extends:
     - .kubernetes-env
     - .build-push-image
     - .publish-refs
   variables:
-    CI_IMAGE:                      ${BUILDAH_IMAGE}
+    CI_IMAGE: ${BUILDAH_IMAGE}
     # scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
-    DOCKERFILE:                    ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
-    IMAGE_NAME:                    docker.io/paritytech/staking-miner
-    GIT_STRATEGY:                  none
-    DOCKER_USER:                   ${Docker_Hub_User_Parity}
-    DOCKER_PASS:                   ${Docker_Hub_Pass_Parity}
+    DOCKERFILE: ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
+    IMAGE_NAME: docker.io/paritytech/staking-miner
+    GIT_STRATEGY: none
+    DOCKER_USER: ${Docker_Hub_User_Parity}
+    DOCKER_PASS: ${Docker_Hub_Pass_Parity}
   needs:
-    - job:                         build-staking-miner
-      artifacts:                   true
-
+    - job: build-staking-miner
+      artifacts: true
 
 publish-s3-release:
-  stage:                           publish
+  stage: publish
   extends:
     - .kubernetes-env
   needs:
-    - job:                         build-linux-stable
-      artifacts:                   true
+    - job: build-linux-stable
+      artifacts: true
   variables:
-    CI_IMAGE:                      paritytech/awscli:latest
-    GIT_STRATEGY:                  none
-    PREFIX:                        "builds/polkadot/${ARCH}-${DOCKER_OS}"
+    CI_IMAGE: paritytech/awscli:latest
+    GIT_STRATEGY: none
+    PREFIX: "builds/polkadot/${ARCH}-${DOCKER_OS}"
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
@@ -138,10 +137,10 @@ publish-s3-release:
     - aws s3 sync --acl public-read ./artifacts/ s3://${AWS_BUCKET}/${PREFIX}/${VERSION}/
     - echo "update objects at https://releases.parity.io/${PREFIX}/${EXTRATAG}"
     - find ./artifacts -type f | while read file; do
-        name="${file#./artifacts/}";
-        aws s3api copy-object
-          --copy-source ${AWS_BUCKET}/${PREFIX}/${VERSION}/${name}
-          --bucket ${AWS_BUCKET} --key ${PREFIX}/${EXTRATAG}/${name};
+      name="${file#./artifacts/}";
+      aws s3api copy-object
+      --copy-source ${AWS_BUCKET}/${PREFIX}/${VERSION}/${name}
+      --bucket ${AWS_BUCKET} --key ${PREFIX}/${EXTRATAG}/${name};
       done
     - |
       cat <<-EOM
@@ -154,14 +153,14 @@ publish-s3-release:
       EOM
   after_script:
     - aws s3 ls s3://${AWS_BUCKET}/${PREFIX}/${EXTRATAG}/
-        --recursive --human-readable --summarize
+      --recursive --human-readable --summarize
 
 publish-rustdoc:
-  stage:                           publish
+  stage: publish
   extends:
     - .kubernetes-env
   variables:
-    CI_IMAGE:                      paritytech/tools:latest
+    CI_IMAGE: paritytech/tools:latest
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
@@ -170,10 +169,10 @@ publish-rustdoc:
   # `needs:` can be removed after CI image gets nonroot. In this case `needs:` stops other
   # artifacts from being dowloaded by this job.
   needs:
-    - job:                         build-rustdoc
-      artifacts:                   true
-    - job:                         build-implementers-guide
-      artifacts:                   true
+    - job: build-rustdoc
+      artifacts: true
+    - job: build-implementers-guide
+      artifacts: true
   script:
     # Save README and docs
     - cp -r ./crate-docs/ /tmp/doc/
@@ -209,22 +208,22 @@ publish-rustdoc:
     # We don't want to mark the entire job failed if there's nothing to
     # publish though, hence the `|| true`.
     - git commit -m "Updated docs for ${CI_COMMIT_REF_NAME}" ||
-        echo "___Nothing to commit___"
+      echo "___Nothing to commit___"
     - git push origin gh-pages --force
     - echo "___Rustdoc was successfully published to https://paritytech.github.io/polkadot/___"
   after_script:
     - rm -rf .git/ ./*
 
 .update-substrate-template-repository:
-  stage:                           publish
-  extends:                         .kubernetes-env
+  stage: publish
+  extends: .kubernetes-env
   variables:
-    GIT_STRATEGY:                  none
+    GIT_STRATEGY: none
   rules:
     # The template is only updated for FINAL releases
     # i.e. the rule should not cover RC or patch releases
-    - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+$/                     # e.g. v1.0
-    - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/             # e.g. v1.0.0
+    - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+$/ # e.g. v1.0
+    - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/ # e.g. v1.0.0
   script:
     - git clone --depth=1 --branch="$PIPELINE_SCRIPTS_TAG" https://github.com/paritytech/pipeline-scripts
     - export POLKADOT_BRANCH="polkadot-$CI_COMMIT_TAG"
@@ -238,16 +237,16 @@ publish-rustdoc:
 
 # Ref: https://github.com/paritytech/opstooling/issues/111
 update-node-template:
-  extends:                         .update-substrate-template-repository
+  extends: .update-substrate-template-repository
   variables:
-    TARGET_REPOSITORY:             substrate-node-template
-    TEMPLATE_SOURCE:               substrate
-    TEMPLATE_PATH:                 bin/node-template
+    TARGET_REPOSITORY: substrate-node-template
+    TEMPLATE_SOURCE: substrate
+    TEMPLATE_PATH: bin/node-template
 
 # Ref: https://github.com/paritytech/opstooling/issues/111
 update-parachain-template:
-  extends:                         .update-substrate-template-repository
+  extends: .update-substrate-template-repository
   variables:
-    TARGET_REPOSITORY:             substrate-parachain-template
-    TEMPLATE_SOURCE:               cumulus
-    TEMPLATE_PATH:                 parachain-template
+    TARGET_REPOSITORY: substrate-parachain-template
+    TEMPLATE_SOURCE: cumulus
+    TEMPLATE_PATH: parachain-template
diff --git a/polkadot/scripts/ci/gitlab/pipeline/short-benchmarks.yml b/polkadot/scripts/ci/gitlab/pipeline/short-benchmarks.yml
index 52a4074470f050570fa253a0619c4ff9340f47df..89e137cf379b47bf50214e59314a8b636070da86 100644
--- a/polkadot/scripts/ci/gitlab/pipeline/short-benchmarks.yml
+++ b/polkadot/scripts/ci/gitlab/pipeline/short-benchmarks.yml
@@ -2,26 +2,26 @@
 # Here are all jobs that are executed during "short-benchmarks" stage
 
 # Run all pallet benchmarks only once to check if there are any errors
-short-benchmark-polkadot:          &short-bench
-  stage:                           short-benchmarks
+short-benchmark-polkadot: &short-bench
+  stage: short-benchmarks
   extends:
     - .test-pr-refs
     - .docker-env
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   needs:
-    - job:                         build-short-benchmark
-      artifacts:                   true
+    - job: build-short-benchmark
+      artifacts: true
   variables:
-    RUNTIME:                       polkadot
+    RUNTIME: polkadot
   script:
     - ./artifacts/polkadot benchmark pallet --execution wasm --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
 short-benchmark-kusama:
-  <<:                              *short-bench
+  <<: *short-bench
   variables:
-    RUNTIME:                       kusama
+    RUNTIME: kusama
 
 short-benchmark-westend:
-  <<:                              *short-bench
+  <<: *short-bench
   variables:
-    RUNTIME:                       westend
+    RUNTIME: westend
diff --git a/polkadot/scripts/ci/gitlab/pipeline/test.yml b/polkadot/scripts/ci/gitlab/pipeline/test.yml
index ac77698f43ccacd4c2a823a02bc0df8f35bf4c12..3c94fe31b46f488a38412704268f477d22e0b971 100644
--- a/polkadot/scripts/ci/gitlab/pipeline/test.yml
+++ b/polkadot/scripts/ci/gitlab/pipeline/test.yml
@@ -3,31 +3,31 @@
 
 # It's more like a check and it belongs to the previous stage, but we want to run this job with real tests in parallel
 find-fail-ci-phrase:
-  stage:                           test
+  stage: test
   variables:
-    CI_IMAGE:                      "paritytech/tools:latest"
-    ASSERT_REGEX:                  "FAIL-CI"
-    GIT_DEPTH:                     1
+    CI_IMAGE: "paritytech/tools:latest"
+    ASSERT_REGEX: "FAIL-CI"
+    GIT_DEPTH: 1
   extends:
     - .kubernetes-env
   script:
     - set +e
     - rg --line-number --hidden --type rust --glob '!{.git,target}' "$ASSERT_REGEX" .; exit_status=$?
-    - if [ $exit_status -eq 0 ]; then 
-        echo "$ASSERT_REGEX was found, exiting with 1";
-        exit 1;
+    - if [ $exit_status -eq 0 ]; then
+      echo "$ASSERT_REGEX was found, exiting with 1";
+      exit 1;
       else
-        echo "No $ASSERT_REGEX was found, exiting with 0";
-        exit 0;
+      echo "No $ASSERT_REGEX was found, exiting with 0";
+      exit 0;
       fi
 
 test-linux-stable:
-  stage:                           test
+  stage: test
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in check.yml
   needs:
-    - job:                         job-starter
-      artifacts:                   false
+    - job: job-starter
+      artifacts: false
   extends:
     - .docker-env
     - .common-refs
@@ -44,22 +44,22 @@ test-linux-stable:
   script:
     - time cargo test --workspace --profile testnet --verbose --locked --features=runtime-benchmarks,runtime-metrics,try-runtime
 
-.check-dependent-project:          &check-dependent-project
-  stage:                           test
+.check-dependent-project: &check-dependent-project
+  stage: test
   extends:
     - .docker-env
     - .test-pr-refs
   script:
     - git clone
-        --depth=1
-        "--branch=$PIPELINE_SCRIPTS_TAG"
-        https://github.com/paritytech/pipeline-scripts
+      --depth=1
+      "--branch=$PIPELINE_SCRIPTS_TAG"
+      https://github.com/paritytech/pipeline-scripts
     - ./pipeline-scripts/check_dependent_project.sh
-        --org paritytech
-        --dependent-repo "$DEPENDENT_REPO"
-        --github-api-token "$GITHUB_PR_TOKEN"
-        --extra-dependencies "$EXTRA_DEPENDENCIES"
-        --companion-overrides "$COMPANION_OVERRIDES"
+      --org paritytech
+      --dependent-repo "$DEPENDENT_REPO"
+      --github-api-token "$GITHUB_PR_TOKEN"
+      --extra-dependencies "$EXTRA_DEPENDENCIES"
+      --companion-overrides "$COMPANION_OVERRIDES"
 
 check-dependent-cumulus:
   <<: *check-dependent-project
@@ -71,7 +71,7 @@ check-dependent-cumulus:
       cumulus: polkadot-v*
 
 test-node-metrics:
-  stage:                           test
+  stage: test
   extends:
     - .docker-env
     - .test-refs
@@ -85,7 +85,7 @@ test-node-metrics:
     - time cargo test  --profile testnet --verbose --locked --features=runtime-metrics -p polkadot-node-metrics
 
 test-deterministic-wasm:
-  stage:                           test
+  stage: test
   extends:
     - .docker-env
     - .test-refs
@@ -94,12 +94,12 @@ test-deterministic-wasm:
     - ./scripts/ci/gitlab/test_deterministic_wasm.sh
 
 cargo-clippy:
-  stage:                           test
+  stage: test
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   # the job can be found in check.yml
   needs:
-    - job:                         job-starter
-      artifacts:                   false
+    - job: job-starter
+      artifacts: false
   variables:
     RUSTY_CACHIER_TOOLCHAIN: nightly
   extends:
diff --git a/polkadot/scripts/ci/gitlab/pipeline/weights.yml b/polkadot/scripts/ci/gitlab/pipeline/weights.yml
index e1f28b427af3b670fd91cbc5fab5fda3a5d270ba..edca9e769b4338a20d7099f8bc4a9bb839883286 100644
--- a/polkadot/scripts/ci/gitlab/pipeline/weights.yml
+++ b/polkadot/scripts/ci/gitlab/pipeline/weights.yml
@@ -1,18 +1,18 @@
 # This file is part of .gitlab-ci.yml
 # Here are all jobs that are executed during "weights" stage
 
-update_polkadot_weights:           &update-weights
+update_polkadot_weights: &update-weights
   # The update-weights pipeline defaults to `interruptible: false` so that we'll be able to
   # reach and run the benchmarking jobs despite the "Auto-cancel redundant pipelines" CI setting.
   # The setting is relevant because future pipelines (e.g. created for new commits or other schedules)
   # might otherwise cancel the benchmark jobs early.
-  interruptible:                   false
-  stage:                           weights
-  timeout:                         1d
-  when:                            manual
-  image:                           $CI_IMAGE
+  interruptible: false
+  stage: weights
+  timeout: 1d
+  when: manual
+  image: $CI_IMAGE
   variables:
-    RUNTIME:                       polkadot
+    RUNTIME: polkadot
   artifacts:
     paths:
       - ${RUNTIME}_weights_${CI_COMMIT_SHORT_SHA}.patch
@@ -24,16 +24,16 @@ update_polkadot_weights:           &update-weights
     - weights
 
 update_kusama_weights:
-  <<:                              *update-weights
+  <<: *update-weights
   variables:
-    RUNTIME:                       kusama
+    RUNTIME: kusama
 
 update_westend_weights:
-  <<:                              *update-weights
+  <<: *update-weights
   variables:
-    RUNTIME:                       westend
+    RUNTIME: westend
 
 update_rococo_weights:
-  <<:                              *update-weights
+  <<: *update-weights
   variables:
-    RUNTIME:                       rococo
+    RUNTIME: rococo
diff --git a/polkadot/scripts/ci/gitlab/pipeline/zombienet.yml b/polkadot/scripts/ci/gitlab/pipeline/zombienet.yml
index b088f20c55ffbb909b067ee10f929f5423badd47..be61502eb8a832ba06c68f90ddf86839bcb5b96d 100644
--- a/polkadot/scripts/ci/gitlab/pipeline/zombienet.yml
+++ b/polkadot/scripts/ci/gitlab/pipeline/zombienet.yml
@@ -2,17 +2,17 @@
 # Here are all jobs that are executed during "zombienet" stage
 
 zombienet-tests-parachains-smoke-test:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-malus-image
-    - job:                         publish-test-collators-image
+    - job: publish-polkadot-debug-image
+    - job: publish-malus-image
+    - job: publish-test-collators-image
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE}"
@@ -25,24 +25,24 @@ zombienet-tests-parachains-smoke-test:
     - export COL_IMAGE="docker.io/paritypr/colander:4519" # The collator image is fixed
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0001-parachains-smoke-test.zndsl"
-  allow_failure:                   false
+      --github-remote-dir="${GH_DIR}"
+      --test="0001-parachains-smoke-test.zndsl"
+  allow_failure: false
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-tests-parachains-pvf:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-test-collators-image
+    - job: publish-polkadot-debug-image
+    - job: publish-test-collators-image
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE}"
@@ -55,25 +55,25 @@ zombienet-tests-parachains-pvf:
     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0001-parachains-pvf.zndsl"
-  allow_failure:                   false
+      --github-remote-dir="${GH_DIR}"
+      --test="0001-parachains-pvf.zndsl"
+  allow_failure: false
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-tests-parachains-disputes:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-test-collators-image
-    - job:                         publish-malus-image
+    - job: publish-polkadot-debug-image
+    - job: publish-test-collators-image
+    - job: publish-malus-image
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -86,25 +86,25 @@ zombienet-tests-parachains-disputes:
     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0002-parachains-disputes.zndsl"
-  allow_failure:                   false
+      --github-remote-dir="${GH_DIR}"
+      --test="0002-parachains-disputes.zndsl"
+  allow_failure: false
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-tests-parachains-disputes-garbage-candidate:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-test-collators-image
-    - job:                         publish-malus-image
+    - job: publish-polkadot-debug-image
+    - job: publish-test-collators-image
+    - job: publish-malus-image
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -117,25 +117,25 @@ zombienet-tests-parachains-disputes-garbage-candidate:
     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0003-parachains-garbage-candidate.zndsl"
-  allow_failure:                   false
+      --github-remote-dir="${GH_DIR}"
+      --test="0003-parachains-garbage-candidate.zndsl"
+  allow_failure: false
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-test-parachains-upgrade-smoke-test:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-malus-image
-    - job:                         publish-test-collators-image
+    - job: publish-polkadot-debug-image
+    - job: publish-malus-image
+    - job: publish-test-collators-image
   variables:
-    GH_DIR:                        'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke'
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
   before_script:
     - echo "ZombieNet Tests Config"
     - echo "${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
@@ -147,25 +147,25 @@ zombienet-test-parachains-upgrade-smoke-test:
     - export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0002-parachains-upgrade-smoke-test.zndsl"
-  allow_failure:                   true
+      --github-remote-dir="${GH_DIR}"
+      --test="0002-parachains-upgrade-smoke-test.zndsl"
+  allow_failure: true
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-tests-misc-paritydb:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-test-collators-image
-      artifacts:                   true
+    - job: publish-polkadot-debug-image
+    - job: publish-test-collators-image
+      artifacts: true
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -176,26 +176,26 @@ zombienet-tests-misc-paritydb:
     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0001-paritydb.zndsl"
-  allow_failure:                   false
+      --github-remote-dir="${GH_DIR}"
+      --test="0001-paritydb.zndsl"
+  allow_failure: false
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-tests-misc-upgrade-node:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-test-collators-image
-    - job:                         build-linux-stable
-      artifacts:                   true
+    - job: publish-polkadot-debug-image
+    - job: publish-test-collators-image
+    - job: build-linux-stable
+      artifacts: true
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -208,25 +208,25 @@ zombienet-tests-misc-upgrade-node:
     - export POLKADOT_PR_BIN_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0002-upgrade-node.zndsl"
-  allow_failure:                   false
+      --github-remote-dir="${GH_DIR}"
+      --test="0002-upgrade-node.zndsl"
+  allow_failure: false
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-tests-malus-dispute-valid:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-malus-image
-    - job:                         publish-test-collators-image
+    - job: publish-polkadot-debug-image
+    - job: publish-malus-image
+    - job: publish-test-collators-image
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/node/malus/integrationtests"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/node/malus/integrationtests"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -239,24 +239,24 @@ zombienet-tests-malus-dispute-valid:
     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0001-dispute-valid-block.zndsl"
-  allow_failure:                   false
+      --github-remote-dir="${GH_DIR}"
+      --test="0001-dispute-valid-block.zndsl"
+  allow_failure: false
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-tests-deregister-register-validator:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
-      artifacts:                   true
+    - job: publish-polkadot-debug-image
+      artifacts: true
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -267,23 +267,23 @@ zombienet-tests-deregister-register-validator:
     - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="0003-deregister-register-validator-smoke.zndsl"
-  allow_failure:                   false
+      --github-remote-dir="${GH_DIR}"
+      --test="0003-deregister-register-validator-smoke.zndsl"
+  allow_failure: false
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
 
 zombienet-tests-beefy-and-mmr:
-  stage:                           zombienet
-  image:                           "${ZOMBIENET_IMAGE}"
+  stage: zombienet
+  image: "${ZOMBIENET_IMAGE}"
   extends:
     - .kubernetes-env
     - .zombienet-refs
   needs:
-    - job:                         publish-polkadot-debug-image
+    - job: publish-polkadot-debug-image
   variables:
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
+    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE_NAME}"
@@ -295,7 +295,7 @@ zombienet-tests-beefy-and-mmr:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
       --github-remote-dir="${GH_DIR}"
       --test="0003-beefy-and-mmr.zndsl"
-  allow_failure:                   true
+  allow_failure: true
   retry: 2
   tags:
     - zombienet-polkadot-integration-test
diff --git a/polkadot/scripts/ci/gitlab/prettier.sh b/polkadot/scripts/ci/gitlab/prettier.sh
new file mode 100755
index 0000000000000000000000000000000000000000..299bbee179dcaeff3fbadffd89fb4548ac878555
--- /dev/null
+++ b/polkadot/scripts/ci/gitlab/prettier.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# meant to be installed via
+#   git config filter.ci-prettier.clean "scripts/ci/gitlab/prettier.sh"
+
+prettier --parser yaml