diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml
index f150054202..28d38d3ecd 100644
--- a/.github/workflows/check-labels.yml
+++ b/.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/.github/workflows/extrinsic-ordering-check-from-bin.yml b/.github/workflows/extrinsic-ordering-check-from-bin.yml
index 2584b170bc..9998608c71 100644
--- a/.github/workflows/extrinsic-ordering-check-from-bin.yml
+++ b/.github/workflows/extrinsic-ordering-check-from-bin.yml
@@ -61,7 +61,7 @@ jobs:
           $CMD >> output.txt
           sed -z -i 's/\n\n/\n/g' output.txt
           cat output.txt | egrep -n -i ''
-          SUMMARY=$(./scripts/extrinsic-ordering-filter.sh output.txt)
+          SUMMARY=$(./scripts/ci/extrinsic-ordering-filter.sh output.txt)
           echo -e $SUMMARY
           echo -e $SUMMARY >> output.txt
 
diff --git a/.github/workflows/release-02_create-draft.yml b/.github/workflows/release-02_create-draft.yml
index 3bf4411ac8..04349433ee 100644
--- a/.github/workflows/release-02_create-draft.yml
+++ b/.github/workflows/release-02_create-draft.yml
@@ -99,7 +99,7 @@ jobs:
 
       - name: Prepare tooling
         run: |
-          cd cumulus/scripts/changelog
+          cd cumulus/scripts/ci/changelog
           gem install bundler changelogerator:0.9.1
           bundle install
           changelogerator --help
@@ -137,7 +137,7 @@ jobs:
           ls -al $CANVAS_KUSAMA_DIGEST
 
           echo "The diff will be computed from $REF1 to $REF2"
-          cd cumulus/scripts/changelog
+          cd cumulus/scripts/ci/changelog
           ./bin/changelog $REF1 $REF2 release-notes.md
           ls -al release-notes.md
           ls -al context.json
@@ -158,7 +158,7 @@ jobs:
         with:
           tag_name: parachains-${{ github.ref }}
           release_name: Parachains ${{ github.ref }}
-          body_path: ./cumulus/scripts/changelog/release-notes.md
+          body_path: ./cumulus/scripts/ci/changelog/release-notes.md
           draft: true
 
   publish-runtimes:
@@ -185,7 +185,7 @@ jobs:
       - name: Get runtime version for ${{ matrix.runtime }}
         id: get-runtime-ver
         run: |
-          echo "require './scripts/github/runtime-version.rb'" > script.rb
+          echo "require './scripts/ci/github/runtime-version.rb'" > script.rb
           echo "puts get_runtime(runtime: \"${{ matrix.runtime }}\", runtime_dir: \"$RUNTIME_DIR\")" >> script.rb
 
           echo "Current folder: $PWD"
diff --git a/CODEOWNERS b/CODEOWNERS
index 3810c3101c..bae050d50c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -19,9 +19,5 @@
 # CI
 /.github/ @paritytech/ci @chevdor
 /.gitlab-ci.yml @paritytech/ci
-/scripts/ci/ @paritytech/ci
-/scripts/github/ @paritytech/ci @chevdor
-/scripts/extrinsic-ordering-filter.sh @paritytech/ci @chevdor
+/scripts/ci/ @paritytech/ci @chevdor
 
-# CHANGELOG
-/scripts/changelog/ @chevdor
diff --git a/docker/polkadot-collator_builder.Containerfile b/docker/polkadot-collator_builder.Containerfile
index 4eb7ec04a1..8698bf874d 100644
--- a/docker/polkadot-collator_builder.Containerfile
+++ b/docker/polkadot-collator_builder.Containerfile
@@ -1,4 +1,4 @@
-# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile
+# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
 # This is the build stage for Polkadot-collator. Here we create the binary in a temporary image.
 FROM docker.io/paritytech/ci-linux:production as builder
 
@@ -14,7 +14,7 @@ LABEL io.parity.image.type="builder" \
     io.parity.image.authors="devops-team@parity.io" \
     io.parity.image.vendor="Parity Technologies" \
     io.parity.image.description="Multistage Docker image for Polkadot-collator" \
-    io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/docker/test-parachain-collator.dockerfile" \
+    io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot-collator_builder.Dockerfile" \
     io.parity.image.documentation="https://github.com/paritytech/cumulus"
 
 COPY --from=builder /cumulus/target/release/polkadot-collator /usr/local/bin
diff --git a/docker/test-parachain-collator.dockerfile b/docker/test-parachain-collator.dockerfile
index 72e4e0d67e..42fe4c17da 100644
--- a/docker/test-parachain-collator.dockerfile
+++ b/docker/test-parachain-collator.dockerfile
@@ -1,4 +1,4 @@
-# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile
+# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
 FROM docker.io/paritytech/ci-linux:production as builder
 
 WORKDIR /cumulus
diff --git a/scripts/changelog/.gitignore b/scripts/ci/changelog/.gitignore
similarity index 100%
rename from scripts/changelog/.gitignore
rename to scripts/ci/changelog/.gitignore
diff --git a/scripts/changelog/Gemfile b/scripts/ci/changelog/Gemfile
similarity index 100%
rename from scripts/changelog/Gemfile
rename to scripts/ci/changelog/Gemfile
diff --git a/scripts/changelog/Gemfile.lock b/scripts/ci/changelog/Gemfile.lock
similarity index 100%
rename from scripts/changelog/Gemfile.lock
rename to scripts/ci/changelog/Gemfile.lock
diff --git a/scripts/changelog/README.md b/scripts/ci/changelog/README.md
similarity index 93%
rename from scripts/changelog/README.md
rename to scripts/ci/changelog/README.md
index 7226530c42..c4c10c85b5 100644
--- a/scripts/changelog/README.md
+++ b/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
 
-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/scripts/changelog/bin/changelog b/scripts/ci/changelog/bin/changelog
similarity index 100%
rename from scripts/changelog/bin/changelog
rename to scripts/ci/changelog/bin/changelog
diff --git a/scripts/changelog/digests/.gitignore b/scripts/ci/changelog/digests/.gitignore
similarity index 100%
rename from scripts/changelog/digests/.gitignore
rename to scripts/ci/changelog/digests/.gitignore
diff --git a/scripts/changelog/digests/.gitkeep b/scripts/ci/changelog/digests/.gitkeep
similarity index 100%
rename from scripts/changelog/digests/.gitkeep
rename to scripts/ci/changelog/digests/.gitkeep
diff --git a/scripts/changelog/lib/changelog.rb b/scripts/ci/changelog/lib/changelog.rb
similarity index 100%
rename from scripts/changelog/lib/changelog.rb
rename to scripts/ci/changelog/lib/changelog.rb
diff --git a/scripts/changelog/templates/change.md.tera b/scripts/ci/changelog/templates/change.md.tera
similarity index 100%
rename from scripts/changelog/templates/change.md.tera
rename to scripts/ci/changelog/templates/change.md.tera
diff --git a/scripts/changelog/templates/changes.md.tera b/scripts/ci/changelog/templates/changes.md.tera
similarity index 100%
rename from scripts/changelog/templates/changes.md.tera
rename to scripts/ci/changelog/templates/changes.md.tera
diff --git a/scripts/changelog/templates/changes_client.md.tera b/scripts/ci/changelog/templates/changes_client.md.tera
similarity index 100%
rename from scripts/changelog/templates/changes_client.md.tera
rename to scripts/ci/changelog/templates/changes_client.md.tera
diff --git a/scripts/changelog/templates/changes_misc.md.tera b/scripts/ci/changelog/templates/changes_misc.md.tera
similarity index 100%
rename from scripts/changelog/templates/changes_misc.md.tera
rename to scripts/ci/changelog/templates/changes_misc.md.tera
diff --git a/scripts/changelog/templates/changes_runtime.md.tera b/scripts/ci/changelog/templates/changes_runtime.md.tera
similarity index 100%
rename from scripts/changelog/templates/changes_runtime.md.tera
rename to scripts/ci/changelog/templates/changes_runtime.md.tera
diff --git a/scripts/changelog/templates/compiler.md.tera b/scripts/ci/changelog/templates/compiler.md.tera
similarity index 100%
rename from scripts/changelog/templates/compiler.md.tera
rename to scripts/ci/changelog/templates/compiler.md.tera
diff --git a/scripts/changelog/templates/debug.md.tera b/scripts/ci/changelog/templates/debug.md.tera
similarity index 100%
rename from scripts/changelog/templates/debug.md.tera
rename to scripts/ci/changelog/templates/debug.md.tera
diff --git a/scripts/changelog/templates/docker_image.md.tera b/scripts/ci/changelog/templates/docker_image.md.tera
similarity index 100%
rename from scripts/changelog/templates/docker_image.md.tera
rename to scripts/ci/changelog/templates/docker_image.md.tera
diff --git a/scripts/changelog/templates/global_priority.md.tera b/scripts/ci/changelog/templates/global_priority.md.tera
similarity index 100%
rename from scripts/changelog/templates/global_priority.md.tera
rename to scripts/ci/changelog/templates/global_priority.md.tera
diff --git a/scripts/changelog/templates/high_priority.md.tera b/scripts/ci/changelog/templates/high_priority.md.tera
similarity index 100%
rename from scripts/changelog/templates/high_priority.md.tera
rename to scripts/ci/changelog/templates/high_priority.md.tera
diff --git a/scripts/changelog/templates/host_functions.md.tera b/scripts/ci/changelog/templates/host_functions.md.tera
similarity index 100%
rename from scripts/changelog/templates/host_functions.md.tera
rename to scripts/ci/changelog/templates/host_functions.md.tera
diff --git a/scripts/changelog/templates/migrations.md.tera b/scripts/ci/changelog/templates/migrations.md.tera
similarity index 100%
rename from scripts/changelog/templates/migrations.md.tera
rename to scripts/ci/changelog/templates/migrations.md.tera
diff --git a/scripts/changelog/templates/pre_release.md.tera b/scripts/ci/changelog/templates/pre_release.md.tera
similarity index 100%
rename from scripts/changelog/templates/pre_release.md.tera
rename to scripts/ci/changelog/templates/pre_release.md.tera
diff --git a/scripts/changelog/templates/runtime.md.tera b/scripts/ci/changelog/templates/runtime.md.tera
similarity index 100%
rename from scripts/changelog/templates/runtime.md.tera
rename to scripts/ci/changelog/templates/runtime.md.tera
diff --git a/scripts/changelog/templates/runtimes.md.tera b/scripts/ci/changelog/templates/runtimes.md.tera
similarity index 100%
rename from scripts/changelog/templates/runtimes.md.tera
rename to scripts/ci/changelog/templates/runtimes.md.tera
diff --git a/scripts/changelog/templates/template.md.tera b/scripts/ci/changelog/templates/template.md.tera
similarity index 100%
rename from scripts/changelog/templates/template.md.tera
rename to scripts/ci/changelog/templates/template.md.tera
diff --git a/scripts/changelog/test/test_basic.rb b/scripts/ci/changelog/test/test_basic.rb
similarity index 100%
rename from scripts/changelog/test/test_basic.rb
rename to scripts/ci/changelog/test/test_basic.rb
diff --git a/scripts/common/lib.sh b/scripts/ci/common/lib.sh
similarity index 100%
rename from scripts/common/lib.sh
rename to scripts/ci/common/lib.sh
diff --git a/scripts/extrinsic-ordering-filter.sh b/scripts/ci/extrinsic-ordering-filter.sh
similarity index 100%
rename from scripts/extrinsic-ordering-filter.sh
rename to scripts/ci/extrinsic-ordering-filter.sh
diff --git a/scripts/github/check_labels.sh b/scripts/ci/github/check_labels.sh
similarity index 100%
rename from scripts/github/check_labels.sh
rename to scripts/ci/github/check_labels.sh
diff --git a/scripts/github/runtime-version.rb b/scripts/ci/github/runtime-version.rb
similarity index 100%
rename from scripts/github/runtime-version.rb
rename to scripts/ci/github/runtime-version.rb