diff --git a/.env b/.env
index f4b1b488..884bd084 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
+PLATFORM="ios"
 APP_NAME="Passepartout"
 GYM_SCHEME="Passepartout-iOS"
 MATCH_READONLY="true"
diff --git a/.gitignore b/.gitignore
index 03d50ccf..8eef9f7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@ fastlane/metadata/review_information
 fastlane/metadata/trade_representative_contact_information
 build/
 dist/
-ci/CHANGELOG.md
-ci/DESCRIPTION.md
-ci/beta-feedback.txt
+templates/
 .env.secret*
 Preview.html
diff --git a/.gitmodules b/.gitmodules
index 50823d93..565415b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "Submodules/Core"]
 	path = Submodules/Core
 	url = https://github.com/passepartoutvpn/passepartout-core-apple
+[submodule "Submodules/fastlane-ci-templates"]
+	path = Submodules/fastlane-ci-templates
+	url = git@github.com:keeshux/fastlane-ci-templates
diff --git a/Submodules/fastlane-ci-templates b/Submodules/fastlane-ci-templates
new file mode 160000
index 00000000..3322ad51
--- /dev/null
+++ b/Submodules/fastlane-ci-templates
@@ -0,0 +1 @@
+Subproject commit 3322ad51f6ac6470da73d232c7b9995ba6aa1828
diff --git a/ci b/ci
new file mode 120000
index 00000000..4ca5a390
--- /dev/null
+++ b/ci
@@ -0,0 +1 @@
+Submodules/fastlane-ci-templates/ci/
\ No newline at end of file
diff --git a/ci/beta-archive.sh b/ci/beta-archive.sh
deleted file mode 100755
index f7d631f5..00000000
--- a/ci/beta-archive.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-TARGET="beta" bundle exec fastlane --env secret-codesign,beta-archive create_archive
diff --git a/ci/beta-certs.sh b/ci/beta-certs.sh
deleted file mode 100755
index 8a91575a..00000000
--- a/ci/beta-certs.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-bundle exec fastlane --env secret-codesign,secret-deploy update_provisioning type:appstore readonly:false
diff --git a/ci/beta-deploy.sh b/ci/beta-deploy.sh
deleted file mode 100755
index 9b788848..00000000
--- a/ci/beta-deploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-VERSION=`agvtool mvers -terse1`
-BUILD=`agvtool vers -terse`
-TARGET="beta" bundle exec fastlane --env secret-deploy,beta-deploy beta_deploy && git tag "v$VERSION-b$BUILD"
diff --git a/ci/build-number.sh b/ci/build-number.sh
deleted file mode 100755
index daca34fa..00000000
--- a/ci/build-number.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-BASE=`agvtool what-version -terse`
-COUNT=`git rev-list --count HEAD`
-echo $((BASE + COUNT))
diff --git a/ci/commit-changelog.sh b/ci/commit-changelog.sh
deleted file mode 100755
index 544ae8f8..00000000
--- a/ci/commit-changelog.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-VERSION=`ci/version-number.sh`
-BUILD=$((`ci/build-number.sh` + 1))
-DATE=`date "+%Y-%m-%d"`
-CHANGELOG="CHANGELOG.md"
-RELEASE_NOTES="fastlane/metadata/en-US/release_notes.txt"
-
-sed "s/Unreleased/$VERSION Beta $BUILD ($DATE)/" $CHANGELOG >$CHANGELOG.tmp
-mv $CHANGELOG.tmp $CHANGELOG
-ci/latest-changelog.sh | ci/strip-issues.sh >ci/$CHANGELOG
-cp ci/$CHANGELOG $RELEASE_NOTES
-git add $CHANGELOG $RELEASE_NOTES
-git commit -m "Set beta release"
diff --git a/ci/dev-archive.sh b/ci/dev-archive.sh
deleted file mode 100755
index f3f0190b..00000000
--- a/ci/dev-archive.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-TARGET="dev" bundle exec fastlane --env secret-codesign,dev-archive create_archive
diff --git a/ci/dev-certs.sh b/ci/dev-certs.sh
deleted file mode 100755
index ba703fd6..00000000
--- a/ci/dev-certs.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-bundle exec fastlane --env secret-codesign,secret-deploy update_provisioning type:adhoc readonly:false
diff --git a/ci/dev-deploy.sh b/ci/dev-deploy.sh
deleted file mode 100755
index 98a01c0c..00000000
--- a/ci/dev-deploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-VERSION=`agvtool mvers -terse1`
-BUILD=`agvtool vers -terse`
-TARGET="dev" bundle exec fastlane --env secret-deploy,dev-deploy dev_deploy #&& git tag "v$VERSION-a$BUILD"
diff --git a/ci/latest-changelog.sh b/ci/latest-changelog.sh
deleted file mode 100755
index 7240b6c7..00000000
--- a/ci/latest-changelog.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-TARGET="CHANGELOG.md"
-RELEASES=(`grep -n "^## " $TARGET | sed -E "s/^([0-9]+).*$/\1/g"`)
-UNRELEASED=${RELEASES[0]}
-LATEST=${RELEASES[1]}
-cat $TARGET | head -n $((LATEST - 1)) | tail -n $((LATEST - UNRELEASED - 2))
diff --git a/ci/set-build.sh b/ci/set-build.sh
deleted file mode 100755
index fcacebce..00000000
--- a/ci/set-build.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-bundle exec fastlane run increment_build_number build_number:$1
diff --git a/ci/set-version.sh b/ci/set-version.sh
deleted file mode 100755
index 3a3cff34..00000000
--- a/ci/set-version.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-agvtool new-marketing-version $1
diff --git a/ci/strip-issues.sh b/ci/strip-issues.sh
deleted file mode 100755
index 56dc8ef3..00000000
--- a/ci/strip-issues.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-sed -E "s/^(.*)\. .*$/\1./"
diff --git a/ci/update-asc-metadata.sh b/ci/update-asc-metadata.sh
deleted file mode 100755
index 6945b9d3..00000000
--- a/ci/update-asc-metadata.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-bundle exec fastlane --env secret-deploy update_metadata
diff --git a/ci/update-asc-screenshots.sh b/ci/update-asc-screenshots.sh
deleted file mode 100755
index 2b01f540..00000000
--- a/ci/update-asc-screenshots.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-bundle exec fastlane --env secret-deploy update_screenshots
diff --git a/ci/version-number.sh b/ci/version-number.sh
deleted file mode 100755
index ab1f543b..00000000
--- a/ci/version-number.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-agvtool what-marketing-version -terse1
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 668e5326..ab8b3697 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -13,63 +13,6 @@
 # Uncomment the line if you want fastlane to automatically update itself
 # update_fastlane
 
-build_description_path = "../ci/DESCRIPTION.md" # "../#{ENV["BUILD_DESCRIPTION_PATH"]}"
-build_changelog_path = "../ci/CHANGELOG.md" # "../#{ENV["BUILD_CHANGELOG_PATH"]}"
-beta_feedback_path = "../ci/beta-feedback.txt"
+default_platform(:ios)
 
-desc "Prepare a new build"
-lane :prepare_archive do
-    ensure_git_status_clean
-    cocoapods
-    get_build_number
-    base_build_number = lane_context[SharedValues::BUILD_NUMBER].to_i
-    increment_build_number(
-        build_number: base_build_number + number_of_commits
-    )
-end
-
-desc "Archive a new build"
-lane :create_archive do
-    prepare_archive
-    match
-    gym
-end
-
-desc "Set build changelog"
-lane :set_build_changelog do
-    lane_context[SharedValues::FL_CHANGELOG] = File.read(build_changelog_path)
-end
-
-desc "Submit a build to App Center"
-lane :dev_deploy do
-    set_build_changelog
-    appcenter_upload
-end
-
-desc "Submit a build to TestFlight"
-lane :beta_deploy do
-    set_build_changelog
-    pilot(
-        beta_app_description: File.read(build_description_path),
-        beta_app_feedback_email: File.read(beta_feedback_path)
-    )
-end
-
-desc "Update App Store metadata"
-lane :update_metadata do
-    deliver(
-        skip_screenshots: true
-    )
-end
-
-desc "Update App Store screenshots"
-lane :update_screenshots do
-    deliver(
-        skip_metadata: true
-    )
-end
-
-desc "Update provisioning profiles"
-lane :update_provisioning do |options|
-    match(options)
-end
+import("../Submodules/fastlane-ci-templates/include/Fastfile.include")
diff --git a/ci/copy-readme-snapshots.sh b/scripts/copy-readme-snapshots.sh
similarity index 100%
rename from ci/copy-readme-snapshots.sh
rename to scripts/copy-readme-snapshots.sh
diff --git a/ci/copy-release-notes.sh b/scripts/copy-release-notes.sh
similarity index 100%
rename from ci/copy-release-notes.sh
rename to scripts/copy-release-notes.sh
diff --git a/ci/downscale-icon.sh b/scripts/downscale-icon.sh
similarity index 100%
rename from ci/downscale-icon.sh
rename to scripts/downscale-icon.sh
diff --git a/ci/list-untranslated.sh b/scripts/list-untranslated.sh
similarity index 100%
rename from ci/list-untranslated.sh
rename to scripts/list-untranslated.sh
diff --git a/ci/push-release.sh b/scripts/push-release.sh
similarity index 100%
rename from ci/push-release.sh
rename to scripts/push-release.sh
diff --git a/ci/reset-archive.sh b/scripts/reset-archive.sh
similarity index 100%
rename from ci/reset-archive.sh
rename to scripts/reset-archive.sh