diff --git a/polkadot/.github/CODEOWNERS b/polkadot/.github/CODEOWNERS
index d0cae74ff9..1255c06050 100644
--- a/polkadot/.github/CODEOWNERS
+++ b/polkadot/.github/CODEOWNERS
@@ -1,7 +1,6 @@
-bridges/ @tomusdrw @svyatonik @adoerr @acatangiu @antonio-dropulic
+bridges/ @tomusdrw @svyatonik @acatangiu
 
 # CI
 /.github/ @paritytech/ci @chevdor
-/scripts/github/ @paritytech/ci @chevdor
-/scripts/gitlab/ @paritytech/ci @chevdor
+/scripts/ci/ @paritytech/ci @chevdor
 /.gitlab-ci.yml @paritytech/ci
diff --git a/polkadot/.github/workflows/check-labels.yml b/polkadot/.github/workflows/check-labels.yml
index f150054202..28d38d3ecd 100644
--- a/polkadot/.github/workflows/check-labels.yml
+++ b/polkadot/.github/workflows/check-labels.yml
@@ -15,7 +15,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
       - name: Check labels
-        run: bash ${{ github.workspace }}/scripts/github/check_labels.sh
+        run: bash ${{ github.workspace }}/scripts/ci/github/check_labels.sh
         env:
           GITHUB_PR: ${{ github.event.pull_request.number }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/polkadot/.github/workflows/extrinsic-ordering-check-from-bin.yml b/polkadot/.github/workflows/extrinsic-ordering-check-from-bin.yml
index 3a67aeb9a4..118ddd3d21 100644
--- a/polkadot/.github/workflows/extrinsic-ordering-check-from-bin.yml
+++ b/polkadot/.github/workflows/extrinsic-ordering-check-from-bin.yml
@@ -62,7 +62,7 @@ jobs:
           $CMD >> output.txt
           sed -z -i 's/\n\n/\n/g' output.txt
           cat output.txt | egrep -n -i ''
-          SUMMARY=$(./scripts/github/extrinsic-ordering-filter.sh output.txt)
+          SUMMARY=$(./scripts/ci/github/extrinsic-ordering-filter.sh output.txt)
           echo -e $SUMMARY
           echo -e $SUMMARY >> output.txt
 
diff --git a/polkadot/.github/workflows/honggfuzz.yml b/polkadot/.github/workflows/honggfuzz.yml
index c04e6c12b4..df35654c39 100644
--- a/polkadot/.github/workflows/honggfuzz.yml
+++ b/polkadot/.github/workflows/honggfuzz.yml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Run fuzzer
         working-directory: xcm/xcm-simulator/fuzzer/
-        run: bash $GITHUB_WORKSPACE/scripts/github/run_fuzzer.sh xcm-fuzzer
+        run: bash $GITHUB_WORKSPACE/scripts/ci/github/run_fuzzer.sh xcm-fuzzer
 
   erasure-coding-round-trip:
     runs-on: ubuntu-latest
@@ -88,7 +88,7 @@ jobs:
 
       - name: Run fuzzer
         working-directory: erasure-coding/fuzzer
-        run: bash $GITHUB_WORKSPACE/scripts/github/run_fuzzer.sh round_trip
+        run: bash $GITHUB_WORKSPACE/scripts/ci/github/run_fuzzer.sh round_trip
 
   erasure-coding-reconstruct:
     runs-on: ubuntu-latest
@@ -134,4 +134,4 @@ jobs:
 
       - name: Run fuzzer
         working-directory: erasure-coding/fuzzer
-        run: bash $GITHUB_WORKSPACE/scripts/github/run_fuzzer.sh reconstruct
+        run: bash $GITHUB_WORKSPACE/scripts/ci/github/run_fuzzer.sh reconstruct
diff --git a/polkadot/.github/workflows/publish-docker-manual.yml b/polkadot/.github/workflows/publish-docker-manual.yml
index 2d10832f39..9f7cd38349 100644
--- a/polkadot/.github/workflows/publish-docker-manual.yml
+++ b/polkadot/.github/workflows/publish-docker-manual.yml
@@ -37,7 +37,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          file: scripts/dockerfiles/polkadot_injected_release.Dockerfile
+          file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
           tags: |
             parity/polkadot:latest
             parity/polkadot:${{ github.event.inputs.version }}
diff --git a/polkadot/.github/workflows/publish-docker-release.yml b/polkadot/.github/workflows/publish-docker-release.yml
index f3df0b84fd..e0d6e9efe9 100644
--- a/polkadot/.github/workflows/publish-docker-release.yml
+++ b/polkadot/.github/workflows/publish-docker-release.yml
@@ -30,7 +30,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          file: scripts/dockerfiles/polkadot_injected_release.Dockerfile
+          file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
           tags: |
             parity/polkadot:latest
             parity/polkadot:${{ github.event.release.tag_name }}
diff --git a/polkadot/.github/workflows/publish-draft-release.yml b/polkadot/.github/workflows/publish-draft-release.yml
index 4c71c3779c..577f6f024e 100644
--- a/polkadot/.github/workflows/publish-draft-release.yml
+++ b/polkadot/.github/workflows/publish-draft-release.yml
@@ -86,7 +86,7 @@ jobs:
 
       - name: Prepare tooling
         run: |
-          cd polkadot/scripts/changelog
+          cd polkadot/scripts/ci/changelog
           gem install bundler changelogerator:0.9.1
           bundle install
           changelogerator --help
@@ -115,7 +115,7 @@ jobs:
           ls -al $KUSAMA_DIGEST
           ls -al $POLKADOT_DIGEST
 
-          cd polkadot/scripts/changelog
+          cd polkadot/scripts/ci/changelog
 
           ./bin/changelog ${GITHUB_REF}
           ls -al release-notes.md
@@ -126,7 +126,7 @@ jobs:
         with:
           name: release-notes-context
           path: |
-            polkadot/scripts/changelog/context.json
+            polkadot/scripts/ci/changelog/context.json
             **/*_srtool_output.json
 
       - name: Create draft release
@@ -137,7 +137,7 @@ jobs:
         with:
           tag_name: ${{ github.ref }}
           release_name: Polkadot ${{ github.ref }}
-          body_path: ./polkadot/scripts/changelog/release-notes.md
+          body_path: ./polkadot/scripts/ci/changelog/release-notes.md
           draft: true
 
   publish-runtimes:
@@ -160,7 +160,7 @@ jobs:
       - name: Get runtime version
         id: get-runtime-ver
         run: |
-          echo "require './scripts/github/lib.rb'" > script.rb
+          echo "require './scripts/ci/github/lib.rb'" > script.rb
           echo "puts get_runtime(runtime: \"${{ matrix.runtime }}\", runtime_dir: \"$RUNTIME_DIR\")" >> script.rb
 
           echo "Current folder: $PWD"
diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml
index 6f0eb12ab2..6bbc628e14 100644
--- a/polkadot/.gitlab-ci.yml
+++ b/polkadot/.gitlab-ci.yml
@@ -204,7 +204,7 @@ check-runtime:
     GITLAB_API:                    "https://gitlab.parity.io/api/v4"
     GITHUB_API_PROJECT:            "parity%2Finfrastructure%2Fgithub-api"
   script:
-    - ./scripts/gitlab/check_runtime.sh
+    - ./scripts/ci/gitlab/check_runtime.sh
   allow_failure:                   true
 
 cargo-fmt:
@@ -273,7 +273,7 @@ spellcheck:
     - git fetch origin +${CI_DEFAULT_BRANCH}:${CI_DEFAULT_BRANCH}
     - 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/gitlab/spellcheck.toml --checkers hunspell --code 1
+    - 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
 
@@ -295,7 +295,7 @@ build-test-collators:
     - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
     - echo "adder-collator version = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
     - echo "undying-collator version = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
-    - cp -r scripts/* ./artifacts
+    - cp -r ./scripts/* ./artifacts
 
 build-malus:
   stage:                           stage1
@@ -312,7 +312,7 @@ build-malus:
     - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
     - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
     - echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
-    - cp -r scripts/* ./artifacts
+    - cp -r ./scripts/* ./artifacts
 
 #### stage:                        stage2
 
@@ -371,7 +371,7 @@ test-deterministic-wasm:
   <<:                              *docker-env
   <<:                              *compiler-info
   script:
-    - ./scripts/gitlab/test_deterministic_wasm.sh
+    - ./scripts/ci/gitlab/test_deterministic_wasm.sh
 
 check-transaction-versions:
   stage:                           stage2
@@ -388,7 +388,7 @@ check-transaction-versions:
     - git config remote.origin.url "https://github.com/paritytech/polkadot.git"
     - git fetch origin release
   script:
-    - scripts/gitlab/check_extrinsics_ordering.sh
+    - ./scripts/ci/gitlab/check_extrinsics_ordering.sh
 
 
 
@@ -409,8 +409,8 @@ publish-polkadot-debug-image:
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   variables:
     <<:                            *image-variables
-    # scripts/dockerfiles/polkadot_injected_debug.Dockerfile
-    DOCKERFILE:                    dockerfiles/polkadot_injected_debug.Dockerfile
+    # scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile
+    DOCKERFILE:                    ci/dockerfiles/polkadot_injected_debug.Dockerfile
     IMAGE_NAME:                    docker.io/paritypr/polkadot-debug
   needs:
     - job:                         build-linux-stable
@@ -433,8 +433,8 @@ publish-test-collators-image:
   <<:                              *zombienet-refs
   variables:
     <<:                            *image-variables
-    # scripts/dockerfiles/collator_injected.Dockerfile
-    DOCKERFILE:                    dockerfiles/collator_injected.Dockerfile
+    # scripts/ci/dockerfiles/collator_injected.Dockerfile
+    DOCKERFILE:                    ci/dockerfiles/collator_injected.Dockerfile
     IMAGE_NAME:                    docker.io/paritypr/colander
   needs:
     - job:                         build-test-collators
@@ -456,8 +456,8 @@ publish-malus-image:
   <<:                              *zombienet-refs
   variables:
     <<:                            *image-variables
-    # scripts/dockerfiles/malus_injected.Dockerfile
-    DOCKERFILE:                    dockerfiles/malus_injected.Dockerfile
+    # scripts/ci/dockerfiles/malus_injected.Dockerfile
+    DOCKERFILE:                    ci/dockerfiles/malus_injected.Dockerfile
     IMAGE_NAME:                    docker.io/paritypr/malus
   needs:
     - job:                         build-malus
@@ -522,7 +522,7 @@ update_polkadot_weights:           &update-weights
     paths:
       - ${RUNTIME}_weights_${CI_COMMIT_SHORT_SHA}.patch
   script:
-    - ./scripts/run_benches_for_runtime.sh $RUNTIME
+    - ./scripts/ci/run_benches_for_runtime.sh $RUNTIME
     - git diff -P > ${RUNTIME}_weights_${CI_COMMIT_SHORT_SHA}.patch
   # uses the "shell" executors
   tags:
@@ -583,7 +583,7 @@ generate-impl-guide:
     name: michaelfbryan/mdbook-docker-image:v0.4.4
     entrypoint: [""]
   script:
-    - mdbook build roadmap/implementers-guide
+    - mdbook build ./roadmap/implementers-guide
 
 check-try-runtime:
   stage:                           stage3
@@ -610,8 +610,8 @@ check-no-default-features:
   <<:                              *compiler-info
   script:
     # Check that polkadot-cli will compile no default features.
-    - pushd node/service && cargo check --no-default-features && popd
-    - pushd cli && cargo check --no-default-features --features "service" && popd
+    - pushd ./node/service && cargo check --no-default-features && popd
+    - pushd ./cli && cargo check --no-default-features --features "service" && popd
     - sccache -s
 
 build-short-benchmark:
@@ -793,7 +793,7 @@ publish-rustdoc:
     - git fetch origin gh-pages
     # Save README and docs
     - cp -r ./crate-docs/ /tmp/doc/
-    - cp README.md /tmp/doc/
+    - cp ./README.md /tmp/doc/
     - git checkout gh-pages
     # Remove everything and restore generated docs and README
     - rm -rf ./*
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 78339014e8..7af9d8a3ff 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -235,5 +235,4 @@ polkadot = { path = "/usr/bin/polkadot" }
 "../scripts/packaging/polkadot.service" = { path = "/usr/lib/systemd/system/polkadot.service", mode = "644" }
 
 [package.metadata.spellcheck]
-config = "./scripts/gitlab/spellcheck.toml"
-
+config = "./scripts/ci/gitlab/spellcheck.toml"
diff --git a/polkadot/doc/docker.md b/polkadot/doc/docker.md
index 0ffe6ef09a..e8b7fa7473 100644
--- a/polkadot/doc/docker.md
+++ b/polkadot/doc/docker.md
@@ -118,7 +118,7 @@ To get up and running with the smallest footprint on your system, you may use th
 You can build it yourself (it takes a while...) in the shell session of the daemon:
 
 ```bash
-cd scripts/docker/polkadot
+cd scripts/ci/dockerfiles/polkadot
 ./build.sh
 ```
 
diff --git a/polkadot/scripts/changelog/.gitignore b/polkadot/scripts/ci/changelog/.gitignore
similarity index 100%
rename from polkadot/scripts/changelog/.gitignore
rename to polkadot/scripts/ci/changelog/.gitignore
diff --git a/polkadot/scripts/changelog/Gemfile b/polkadot/scripts/ci/changelog/Gemfile
similarity index 100%
rename from polkadot/scripts/changelog/Gemfile
rename to polkadot/scripts/ci/changelog/Gemfile
diff --git a/polkadot/scripts/changelog/Gemfile.lock b/polkadot/scripts/ci/changelog/Gemfile.lock
similarity index 100%
rename from polkadot/scripts/changelog/Gemfile.lock
rename to polkadot/scripts/ci/changelog/Gemfile.lock
diff --git a/polkadot/scripts/changelog/README.md b/polkadot/scripts/ci/changelog/README.md
similarity index 93%
rename from polkadot/scripts/changelog/README.md
rename to polkadot/scripts/ci/changelog/README.md
index cbcc1ea271..2386f7c1b5 100644
--- a/polkadot/scripts/changelog/README.md
+++ b/polkadot/scripts/ci/changelog/README.md
@@ -7,7 +7,7 @@ For now, a bit of preparation is required before you can run the script:
 - store them under the `digests` folder as `<chain>-srtool-digest.json`
 - ensure the `.env` file is up to date with correct information. See below for an example
 
-The content of the release notes is generated from the template files under the `scripts/changelog/templates` folder. For readability and maintenance, the template is split into several small snippets.
+The content of the release notes is generated from the template files under the `scripts/ci/changelog/templates` folder. For readability and maintenance, the template is split into several small snippets.
 
 Run:
 ```
diff --git a/polkadot/scripts/changelog/bin/changelog b/polkadot/scripts/ci/changelog/bin/changelog
similarity index 100%
rename from polkadot/scripts/changelog/bin/changelog
rename to polkadot/scripts/ci/changelog/bin/changelog
diff --git a/polkadot/scripts/changelog/digests/.gitignore b/polkadot/scripts/ci/changelog/digests/.gitignore
similarity index 100%
rename from polkadot/scripts/changelog/digests/.gitignore
rename to polkadot/scripts/ci/changelog/digests/.gitignore
diff --git a/polkadot/scripts/changelog/digests/.gitkeep b/polkadot/scripts/ci/changelog/digests/.gitkeep
similarity index 100%
rename from polkadot/scripts/changelog/digests/.gitkeep
rename to polkadot/scripts/ci/changelog/digests/.gitkeep
diff --git a/polkadot/scripts/changelog/lib/changelog.rb b/polkadot/scripts/ci/changelog/lib/changelog.rb
similarity index 100%
rename from polkadot/scripts/changelog/lib/changelog.rb
rename to polkadot/scripts/ci/changelog/lib/changelog.rb
diff --git a/polkadot/scripts/changelog/templates/change.md.tera b/polkadot/scripts/ci/changelog/templates/change.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/change.md.tera
rename to polkadot/scripts/ci/changelog/templates/change.md.tera
diff --git a/polkadot/scripts/changelog/templates/changes.md.tera b/polkadot/scripts/ci/changelog/templates/changes.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/changes.md.tera
rename to polkadot/scripts/ci/changelog/templates/changes.md.tera
diff --git a/polkadot/scripts/changelog/templates/changes_client.md.tera b/polkadot/scripts/ci/changelog/templates/changes_client.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/changes_client.md.tera
rename to polkadot/scripts/ci/changelog/templates/changes_client.md.tera
diff --git a/polkadot/scripts/changelog/templates/changes_misc.md.tera b/polkadot/scripts/ci/changelog/templates/changes_misc.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/changes_misc.md.tera
rename to polkadot/scripts/ci/changelog/templates/changes_misc.md.tera
diff --git a/polkadot/scripts/changelog/templates/changes_runtime.md.tera b/polkadot/scripts/ci/changelog/templates/changes_runtime.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/changes_runtime.md.tera
rename to polkadot/scripts/ci/changelog/templates/changes_runtime.md.tera
diff --git a/polkadot/scripts/changelog/templates/compiler.md.tera b/polkadot/scripts/ci/changelog/templates/compiler.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/compiler.md.tera
rename to polkadot/scripts/ci/changelog/templates/compiler.md.tera
diff --git a/polkadot/scripts/changelog/templates/debug.md.tera b/polkadot/scripts/ci/changelog/templates/debug.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/debug.md.tera
rename to polkadot/scripts/ci/changelog/templates/debug.md.tera
diff --git a/polkadot/scripts/changelog/templates/docker_image.md.tera b/polkadot/scripts/ci/changelog/templates/docker_image.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/docker_image.md.tera
rename to polkadot/scripts/ci/changelog/templates/docker_image.md.tera
diff --git a/polkadot/scripts/changelog/templates/global_priority.md.tera b/polkadot/scripts/ci/changelog/templates/global_priority.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/global_priority.md.tera
rename to polkadot/scripts/ci/changelog/templates/global_priority.md.tera
diff --git a/polkadot/scripts/changelog/templates/high_priority.md.tera b/polkadot/scripts/ci/changelog/templates/high_priority.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/high_priority.md.tera
rename to polkadot/scripts/ci/changelog/templates/high_priority.md.tera
diff --git a/polkadot/scripts/changelog/templates/host_functions.md.tera b/polkadot/scripts/ci/changelog/templates/host_functions.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/host_functions.md.tera
rename to polkadot/scripts/ci/changelog/templates/host_functions.md.tera
diff --git a/polkadot/scripts/changelog/templates/migrations-db.md.tera b/polkadot/scripts/ci/changelog/templates/migrations-db.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/migrations-db.md.tera
rename to polkadot/scripts/ci/changelog/templates/migrations-db.md.tera
diff --git a/polkadot/scripts/changelog/templates/migrations-runtime.md.tera b/polkadot/scripts/ci/changelog/templates/migrations-runtime.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/migrations-runtime.md.tera
rename to polkadot/scripts/ci/changelog/templates/migrations-runtime.md.tera
diff --git a/polkadot/scripts/changelog/templates/pre_release.md.tera b/polkadot/scripts/ci/changelog/templates/pre_release.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/pre_release.md.tera
rename to polkadot/scripts/ci/changelog/templates/pre_release.md.tera
diff --git a/polkadot/scripts/changelog/templates/runtime.md.tera b/polkadot/scripts/ci/changelog/templates/runtime.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/runtime.md.tera
rename to polkadot/scripts/ci/changelog/templates/runtime.md.tera
diff --git a/polkadot/scripts/changelog/templates/runtimes.md.tera b/polkadot/scripts/ci/changelog/templates/runtimes.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/runtimes.md.tera
rename to polkadot/scripts/ci/changelog/templates/runtimes.md.tera
diff --git a/polkadot/scripts/changelog/templates/template.md.tera b/polkadot/scripts/ci/changelog/templates/template.md.tera
similarity index 100%
rename from polkadot/scripts/changelog/templates/template.md.tera
rename to polkadot/scripts/ci/changelog/templates/template.md.tera
diff --git a/polkadot/scripts/changelog/test/test_basic.rb b/polkadot/scripts/ci/changelog/test/test_basic.rb
similarity index 100%
rename from polkadot/scripts/changelog/test/test_basic.rb
rename to polkadot/scripts/ci/changelog/test/test_basic.rb
diff --git a/polkadot/scripts/common/lib.sh b/polkadot/scripts/ci/common/lib.sh
similarity index 100%
rename from polkadot/scripts/common/lib.sh
rename to polkadot/scripts/ci/common/lib.sh
diff --git a/polkadot/scripts/dockerfiles/collator_injected.Dockerfile b/polkadot/scripts/ci/dockerfiles/collator_injected.Dockerfile
similarity index 90%
rename from polkadot/scripts/dockerfiles/collator_injected.Dockerfile
rename to polkadot/scripts/ci/dockerfiles/collator_injected.Dockerfile
index d204a68b64..91b8cb0057 100644
--- a/polkadot/scripts/dockerfiles/collator_injected.Dockerfile
+++ b/polkadot/scripts/ci/dockerfiles/collator_injected.Dockerfile
@@ -1,4 +1,4 @@
-# this file copies from scripts/docker/Dockerfile and changes only the binary name
+# this file copies from scripts/ci/dockerfiles/Dockerfile and changes only the binary name
 FROM docker.io/library/ubuntu:20.04
 
 # metadata
@@ -10,7 +10,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Injected adder-collator Docker image" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/collator_injected.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/collator_injected.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
 	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
diff --git a/polkadot/scripts/dockerfiles/malus_injected.Dockerfile b/polkadot/scripts/ci/dockerfiles/malus_injected.Dockerfile
similarity index 95%
rename from polkadot/scripts/dockerfiles/malus_injected.Dockerfile
rename to polkadot/scripts/ci/dockerfiles/malus_injected.Dockerfile
index c595bc6331..3f7f1313b3 100644
--- a/polkadot/scripts/dockerfiles/malus_injected.Dockerfile
+++ b/polkadot/scripts/ci/dockerfiles/malus_injected.Dockerfile
@@ -9,7 +9,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Malus - the nemesis of polkadot" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/dockerfiles/malus.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/malus.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
 	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
diff --git a/polkadot/scripts/dockerfiles/polkadot/README.md b/polkadot/scripts/ci/dockerfiles/polkadot/README.md
similarity index 100%
rename from polkadot/scripts/dockerfiles/polkadot/README.md
rename to polkadot/scripts/ci/dockerfiles/polkadot/README.md
diff --git a/polkadot/scripts/dockerfiles/polkadot/build.sh b/polkadot/scripts/ci/dockerfiles/polkadot/build.sh
similarity index 90%
rename from polkadot/scripts/dockerfiles/polkadot/build.sh
rename to polkadot/scripts/ci/dockerfiles/polkadot/build.sh
index c32c20d9ce..d00c9108bd 100755
--- a/polkadot/scripts/dockerfiles/polkadot/build.sh
+++ b/polkadot/scripts/ci/dockerfiles/polkadot/build.sh
@@ -15,7 +15,7 @@ GITREPO=polkadot
 # Build the image
 echo "Building ${GITUSER}/${GITREPO}:latest docker image, hang on!"
 time docker build \
-    -f ./scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile \
+    -f ./scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile \
     -t ${GITUSER}/${GITREPO}:latest \
     -t ${GITUSER}/${GITREPO}:v${VERSION} \
     .
diff --git a/polkadot/scripts/dockerfiles/polkadot/docker-compose-local.yml b/polkadot/scripts/ci/dockerfiles/polkadot/docker-compose-local.yml
similarity index 100%
rename from polkadot/scripts/dockerfiles/polkadot/docker-compose-local.yml
rename to polkadot/scripts/ci/dockerfiles/polkadot/docker-compose-local.yml
diff --git a/polkadot/scripts/dockerfiles/polkadot/docker-compose.yml b/polkadot/scripts/ci/dockerfiles/polkadot/docker-compose.yml
similarity index 100%
rename from polkadot/scripts/dockerfiles/polkadot/docker-compose.yml
rename to polkadot/scripts/ci/dockerfiles/polkadot/docker-compose.yml
diff --git a/polkadot/scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile b/polkadot/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
similarity index 94%
rename from polkadot/scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile
rename to polkadot/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
index 6b096244a5..6e31298432 100644
--- a/polkadot/scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile
+++ b/polkadot/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
@@ -14,7 +14,7 @@ LABEL description="Multistage Docker image for Polkadot: a platform for web3" \
 	io.parity.image.authors="chevdor@gmail.com, devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.description="Polkadot: a platform for web3" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile" \
 	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
 
 COPY --from=builder /polkadot/target/release/polkadot /usr/local/bin
diff --git a/polkadot/scripts/dockerfiles/polkadot_injected_debug.Dockerfile b/polkadot/scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile
similarity index 94%
rename from polkadot/scripts/dockerfiles/polkadot_injected_debug.Dockerfile
rename to polkadot/scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile
index 7ba312bf8b..40dfe3949b 100644
--- a/polkadot/scripts/dockerfiles/polkadot_injected_debug.Dockerfile
+++ b/polkadot/scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile
@@ -9,7 +9,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Polkadot: a platform for web3" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/polkadot_injected_debug.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
 	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
diff --git a/polkadot/scripts/dockerfiles/polkadot_injected_release.Dockerfile b/polkadot/scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
similarity index 95%
rename from polkadot/scripts/dockerfiles/polkadot_injected_release.Dockerfile
rename to polkadot/scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
index 69348e2350..ba0a79e781 100644
--- a/polkadot/scripts/dockerfiles/polkadot_injected_release.Dockerfile
+++ b/polkadot/scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
@@ -11,7 +11,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="parity/polkadot" \
 	io.parity.image.description="Polkadot: a platform for web3. This is the official Parity image with an injected binary." \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/dockerfiles/polkadot_injected_release.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
 	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
diff --git a/polkadot/scripts/dockerfiles/staking-miner/staking-miner_builder.Dockerfile b/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_builder.Dockerfile
similarity index 93%
rename from polkadot/scripts/dockerfiles/staking-miner/staking-miner_builder.Dockerfile
rename to polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_builder.Dockerfile
index 5208dfb65f..a1932095fd 100644
--- a/polkadot/scripts/dockerfiles/staking-miner/staking-miner_builder.Dockerfile
+++ b/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_builder.Dockerfile
@@ -20,7 +20,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="${IMAGE_NAME} for substrate based chains" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/${IMAGE_NAME}/${IMAGE_NAME}_builder.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/${IMAGE_NAME}/${IMAGE_NAME}_builder.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
 	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
diff --git a/polkadot/scripts/dockerfiles/staking-miner/staking-miner_injected.Dockerfile b/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
similarity index 92%
rename from polkadot/scripts/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
rename to polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
index 2d98504b2c..4901ab4a37 100644
--- a/polkadot/scripts/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
+++ b/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
@@ -9,7 +9,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="${IMAGE_NAME} for substrate based chains" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/${IMAGE_NAME}/${IMAGE_NAME}_injected.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/${IMAGE_NAME}/${IMAGE_NAME}_injected.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
 	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
diff --git a/polkadot/scripts/github/check_labels.sh b/polkadot/scripts/ci/github/check_labels.sh
similarity index 100%
rename from polkadot/scripts/github/check_labels.sh
rename to polkadot/scripts/ci/github/check_labels.sh
diff --git a/polkadot/scripts/github/extrinsic-ordering-filter.sh b/polkadot/scripts/ci/github/extrinsic-ordering-filter.sh
similarity index 100%
rename from polkadot/scripts/github/extrinsic-ordering-filter.sh
rename to polkadot/scripts/ci/github/extrinsic-ordering-filter.sh
diff --git a/polkadot/scripts/github/generate_release_text.rb b/polkadot/scripts/ci/github/generate_release_text.rb
similarity index 98%
rename from polkadot/scripts/github/generate_release_text.rb
rename to polkadot/scripts/ci/github/generate_release_text.rb
index 7c03dc73cd..83b3853a34 100644
--- a/polkadot/scripts/github/generate_release_text.rb
+++ b/polkadot/scripts/ci/github/generate_release_text.rb
@@ -45,7 +45,7 @@ polkadot_path = ENV['GITHUB_WORKSPACE'] + '/polkadot/'
 
 # Generate an ERB renderer based on the template .erb file
 renderer = ERB.new(
-  File.read(File.join(polkadot_path, 'scripts/github/polkadot_release.erb')),
+  File.read(File.join(polkadot_path, 'scripts/ci/github/polkadot_release.erb')),
   trim_mode: '<>'
 )
 
diff --git a/polkadot/scripts/github/lib.rb b/polkadot/scripts/ci/github/lib.rb
similarity index 100%
rename from polkadot/scripts/github/lib.rb
rename to polkadot/scripts/ci/github/lib.rb
diff --git a/polkadot/scripts/github/polkadot_release.erb b/polkadot/scripts/ci/github/polkadot_release.erb
similarity index 100%
rename from polkadot/scripts/github/polkadot_release.erb
rename to polkadot/scripts/ci/github/polkadot_release.erb
diff --git a/polkadot/scripts/github/run_fuzzer.sh b/polkadot/scripts/ci/github/run_fuzzer.sh
similarity index 100%
rename from polkadot/scripts/github/run_fuzzer.sh
rename to polkadot/scripts/ci/github/run_fuzzer.sh
diff --git a/polkadot/scripts/gitlab/check_extrinsics_ordering.sh b/polkadot/scripts/ci/gitlab/check_extrinsics_ordering.sh
similarity index 100%
rename from polkadot/scripts/gitlab/check_extrinsics_ordering.sh
rename to polkadot/scripts/ci/gitlab/check_extrinsics_ordering.sh
diff --git a/polkadot/scripts/gitlab/check_runtime.sh b/polkadot/scripts/ci/gitlab/check_runtime.sh
similarity index 100%
rename from polkadot/scripts/gitlab/check_runtime.sh
rename to polkadot/scripts/ci/gitlab/check_runtime.sh
diff --git a/polkadot/scripts/gitlab/lingua.dic b/polkadot/scripts/ci/gitlab/lingua.dic
similarity index 100%
rename from polkadot/scripts/gitlab/lingua.dic
rename to polkadot/scripts/ci/gitlab/lingua.dic
diff --git a/polkadot/scripts/gitlab/spellcheck.toml b/polkadot/scripts/ci/gitlab/spellcheck.toml
similarity index 100%
rename from polkadot/scripts/gitlab/spellcheck.toml
rename to polkadot/scripts/ci/gitlab/spellcheck.toml
diff --git a/polkadot/scripts/gitlab/test_deterministic_wasm.sh b/polkadot/scripts/ci/gitlab/test_deterministic_wasm.sh
similarity index 100%
rename from polkadot/scripts/gitlab/test_deterministic_wasm.sh
rename to polkadot/scripts/ci/gitlab/test_deterministic_wasm.sh
diff --git a/polkadot/scripts/run_benches_for_runtime.sh b/polkadot/scripts/ci/run_benches_for_runtime.sh
similarity index 100%
rename from polkadot/scripts/run_benches_for_runtime.sh
rename to polkadot/scripts/ci/run_benches_for_runtime.sh
diff --git a/polkadot/utils/staking-miner/README.md b/polkadot/utils/staking-miner/README.md
index 6355395b1a..2190443003 100644
--- a/polkadot/utils/staking-miner/README.md
+++ b/polkadot/utils/staking-miner/README.md
@@ -30,7 +30,7 @@ There are 2 options to build a staking-miner Docker image:
 First build the binary as documented [above](#building).
 You may then inject the binary into a Docker base image usingfrom the root of the Polkadot repository:
 ```
-docker build -t staking-miner -f scripts/docker/staking-miner/staking-miner_injected.Dockerfile target/release
+docker build -t staking-miner -f scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile target/release
 ```
 
 ### Building the multi-stage image
@@ -39,7 +39,7 @@ Unlike the injected image that requires a Linux pre-built binary, this option do
 The trade-off however is that it takes a little longer to build and this option is less ideal for CI tasks.
 You may build the multi-stage image the root of the Polkadot repository with:
 ```
-docker build -t staking-miner -f scripts/docker/staking-miner/staking-miner_builder.Dockerfile .
+docker build -t staking-miner -f scripts/ci/dockerfiles/staking-miner/staking-miner_builder.Dockerfile .
 ```
 
 ### Running