diff --git a/Variants/Alpha/Resources/Alpha.xcassets/AlphaAppIcon.appiconset/AppIcon.png b/Variants/Alpha/Resources/Alpha.xcassets/AlphaAppIcon.appiconset/AppIcon.png
new file mode 100644
index 000000000..2f5e49441
Binary files /dev/null and b/Variants/Alpha/Resources/Alpha.xcassets/AlphaAppIcon.appiconset/AppIcon.png differ
diff --git a/Variants/Alpha/Resources/Alpha.xcassets/AlphaAppIcon.appiconset/Contents.json b/Variants/Alpha/Resources/Alpha.xcassets/AlphaAppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..cefcc878e
--- /dev/null
+++ b/Variants/Alpha/Resources/Alpha.xcassets/AlphaAppIcon.appiconset/Contents.json
@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Variants/Alpha/Resources/Alpha.xcassets/Contents.json b/Variants/Alpha/Resources/Alpha.xcassets/Contents.json
new file mode 100644
index 000000000..73c00596a
--- /dev/null
+++ b/Variants/Alpha/Resources/Alpha.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Variants/Alpha/alpha.yml b/Variants/Alpha/alpha.yml
new file mode 100644
index 000000000..ae58d8386
--- /dev/null
+++ b/Variants/Alpha/alpha.yml
@@ -0,0 +1,11 @@
+settings:
+  BASE_APP_GROUP_IDENTIFIER: io.element.pr
+  BASE_BUNDLE_IDENTIFIER: io.element.elementx.pr
+
+targets:
+  ElementX:
+    settings:
+      base:
+        ASSETCATALOG_COMPILER_APPICON_NAME: AlphaAppIcon
+    sources:
+    - path: Resources
\ No newline at end of file
diff --git a/Variants/Nightly/Resources/Nightly.xcassets/Contents.json b/Variants/Nightly/Resources/Nightly.xcassets/Contents.json
new file mode 100644
index 000000000..73c00596a
--- /dev/null
+++ b/Variants/Nightly/Resources/Nightly.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/AppIcon.png b/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/AppIcon.png
new file mode 100644
index 000000000..b79b395e1
Binary files /dev/null and b/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/AppIcon.png differ
diff --git a/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/Contents.json b/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..cefcc878e
--- /dev/null
+++ b/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/Contents.json
@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Variants/Nightly/nightly.yml b/Variants/Nightly/nightly.yml
new file mode 100644
index 000000000..a8a852f07
--- /dev/null
+++ b/Variants/Nightly/nightly.yml
@@ -0,0 +1,11 @@
+settings:
+  BASE_APP_GROUP_IDENTIFIER: io.element.nightly
+  BASE_BUNDLE_IDENTIFIER: io.element.elementx.nightly
+
+targets:
+  ElementX:
+    settings:
+      base:
+        ASSETCATALOG_COMPILER_APPICON_NAME: NightlyAppIcon
+    sources:
+    - path: Resources
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index cd4d3b3e2..ca979f3eb 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -170,7 +170,7 @@ lane :config_nightly do |options|
 
   target_file_path = "../project.yml"
   data = YAML.load_file target_file_path
-  data["include"].append({ "path" => "fastlane/nightly.yml" })
+  data["include"].append({ "path" => "Variants/Nightly/nightly.yml" })
 
   config_secrets()
   
@@ -314,7 +314,7 @@ end
 private_lane :config_xcodegen_alpha do
   target_file_path = "../project.yml"
   data = YAML.load_file target_file_path
-  data["include"].append({ "path" => "fastlane/alpha.yml" })
+  data["include"].append({ "path" => "Variants/Alpha/alpha.yml" })
   File.open(target_file_path, 'w') { |f| YAML.dump(data, f) }
 
   xcodegen(spec: "project.yml")
diff --git a/fastlane/alpha.yml b/fastlane/alpha.yml
deleted file mode 100644
index ccbf08b55..000000000
--- a/fastlane/alpha.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-settings:
-  BASE_APP_GROUP_IDENTIFIER: io.element.pr
-  BASE_BUNDLE_IDENTIFIER: io.element.elementx.pr
diff --git a/fastlane/nightly.yml b/fastlane/nightly.yml
deleted file mode 100644
index 8e41a3208..000000000
--- a/fastlane/nightly.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-settings:
-  BASE_APP_GROUP_IDENTIFIER: io.element.nightly
-  BASE_BUNDLE_IDENTIFIER: io.element.elementx.nightly