diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 23b65881c5..2af5f0c86c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -40,8 +40,6 @@ val selectableVariants = listOf(
   "nightlyProdPerf",
   "nightlyProdRelease",
   "nightlyStagingRelease",
-  "nightlyPnpPerf",
-  "nightlyPnpRelease",
   "playProdDebug",
   "playProdSpinner",
   "playProdCanary",
@@ -54,8 +52,6 @@ val selectableVariants = listOf(
   "playStagingSpinner",
   "playStagingPerf",
   "playStagingInstrumentation",
-  "playPnpDebug",
-  "playPnpSpinner",
   "playStagingRelease",
   "websiteProdSpinner",
   "websiteProdRelease"
@@ -395,15 +391,6 @@ android {
       buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\"")
       buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\"")
     }
-
-    create("pnp") {
-      dimension = "environment"
-
-      initWith(getByName("staging"))
-      applicationIdSuffix = ".pnp"
-
-      buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Pnp\"")
-    }
   }
 
   lint {
diff --git a/app/src/nightlyPnp/AndroidManifest.xml b/app/src/nightlyPnp/AndroidManifest.xml
deleted file mode 100644
index 93821ec6c5..0000000000
--- a/app/src/nightlyPnp/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
-
-    <application
-        android:usesCleartextTraffic="true"
-        tools:replace="android:usesCleartextTraffic"
-        tools:ignore="UnusedAttribute" />
-
-</manifest>
diff --git a/app/src/nightlyPnp/res/drawable/nightly_pnp_background.webp b/app/src/nightlyPnp/res/drawable/nightly_pnp_background.webp
deleted file mode 100644
index 31edecba90..0000000000
Binary files a/app/src/nightlyPnp/res/drawable/nightly_pnp_background.webp and /dev/null differ
diff --git a/app/src/nightlyPnp/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/nightlyPnp/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 605dfc0fee..0000000000
--- a/app/src/nightlyPnp/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/nightly_pnp_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/nightlyPnp/res/values/strings.xml b/app/src/nightlyPnp/res/values/strings.xml
deleted file mode 100644
index fa41b93265..0000000000
--- a/app/src/nightlyPnp/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Signal (PNP)</string>
-</resources>
diff --git a/app/src/pnp/AndroidManifest.xml b/app/src/pnp/AndroidManifest.xml
deleted file mode 100644
index 93821ec6c5..0000000000
--- a/app/src/pnp/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
-
-    <application
-        android:usesCleartextTraffic="true"
-        tools:replace="android:usesCleartextTraffic"
-        tools:ignore="UnusedAttribute" />
-
-</manifest>
diff --git a/app/src/pnp/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/pnp/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index ea3469b682..0000000000
--- a/app/src/pnp/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/storage_color_files"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/pnp/res/values/strings.xml b/app/src/pnp/res/values/strings.xml
deleted file mode 100644
index fa41b93265..0000000000
--- a/app/src/pnp/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Signal (PNP)</string>
-</resources>