diff --git a/auth/build.gradle b/auth/build.gradle
index bf1beb98350b4443b8067347dc83ddaf0f5ceeee..8b21c81df2ecc08423429adbe6184a71e4592ea5 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -37,6 +37,17 @@ android {
         }
     }
 
+    def flavor_dimension_name = "store"
+    flavorDimensions.add(flavor_dimension_name)
+    productFlavors {
+        gplay {
+            dimension flavor_dimension_name
+        }
+        fdroid {
+            dimension flavor_dimension_name
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -62,7 +73,7 @@ dependencies {
     implementation 'com.nulab-inc:zxcvbn:1.8.2'
 
     //Subscriptions
-    implementation 'com.android.billingclient:billing-ktx:6.1.0'
+    gplayImplementation 'com.android.billingclient:billing-ktx:6.1.0'
 
     //QR
     implementation 'com.github.yuriy-budiyev:code-scanner:2.3.2'
@@ -81,35 +92,35 @@ kapt {
     correctErrorTypes = true
 }
 
-def groupIdString = "org.futo.circles"
-def artifactIdString = "auth"
-
-afterEvaluate {
-    Properties properties = new Properties()
-    if (rootProject.file("local.properties").exists()) {
-        properties.load(rootProject.file("local.properties").newDataInputStream())
-    }
-    publishing {
-        publications {
-            release(MavenPublication) {
-                from components.release
-                groupId groupIdString
-                artifactId artifactIdString
-                version rootProject.ext.modules_version
-            }
-        }
-        repositories {
-            maven {
-                url "https://gitlab.futo.org/api/v4/projects/$rootProject.ext.modules_gitlab_projectId/packages/maven"
-                name "GitLab"
-                credentials(HttpHeaderCredentials) {
-                    name = "Private-Token"
-                    value = properties.getProperty("PUBLISH_TOKEN")
-                }
-                authentication {
-                    header(HttpHeaderAuthentication)
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
+//def groupIdString = "org.futo.circles"
+//def artifactIdString = "auth"
+//
+//afterEvaluate {
+//    Properties properties = new Properties()
+//    if (rootProject.file("local.properties").exists()) {
+//        properties.load(rootProject.file("local.properties").newDataInputStream())
+//    }
+//    publishing {
+//        publications {
+//            release(MavenPublication) {
+//                from components.release
+//                groupId groupIdString
+//                artifactId artifactIdString
+//                version rootProject.ext.modules_version
+//            }
+//        }
+//        repositories {
+//            maven {
+//                url "https://gitlab.futo.org/api/v4/projects/$rootProject.ext.modules_gitlab_projectId/packages/maven"
+//                name "GitLab"
+//                credentials(HttpHeaderCredentials) {
+//                    name = "Private-Token"
+//                    value = properties.getProperty("PUBLISH_TOKEN")
+//                }
+//                authentication {
+//                    header(HttpHeaderAuthentication)
+//                }
+//            }
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/auth/src/fdroid/java/org/futo/circles/auth/di/SubscriptionsModule.kt b/auth/src/fdroid/java/org/futo/circles/auth/di/SubscriptionsModule.kt
new file mode 100644
index 0000000000000000000000000000000000000000..bcc9c290ab68ec7b1e74c2f9b6387b3f3ef68d20
--- /dev/null
+++ b/auth/src/fdroid/java/org/futo/circles/auth/di/SubscriptionsModule.kt
@@ -0,0 +1,27 @@
+package org.futo.circles.auth.di
+
+import androidx.fragment.app.Fragment
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.futo.circles.auth.subscriptions.ItemPurchasedListener
+import org.futo.circles.auth.subscriptions.SubscriptionManager
+import org.futo.circles.auth.subscriptions.SubscriptionProvider
+
+@Module
+@InstallIn(SingletonComponent::class)
+object SubscriptionsModule {
+
+    @Provides
+    fun provideSubscriptionProvider(): SubscriptionProvider {
+        return object : SubscriptionProvider {
+            override fun getManager(
+                fragment: Fragment,
+                itemPurchaseListener: ItemPurchasedListener?
+            ): SubscriptionManager =
+                throw IllegalArgumentException("subscriptions is not supported for F-Droid")
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/auth/src/main/java/org/futo/circles/auth/di/SubscriptionsModule.kt b/auth/src/gplay/java/org/futo/circles/auth/di/SubscriptionsModule.kt
similarity index 100%
rename from auth/src/main/java/org/futo/circles/auth/di/SubscriptionsModule.kt
rename to auth/src/gplay/java/org/futo/circles/auth/di/SubscriptionsModule.kt
diff --git a/auth/src/main/java/org/futo/circles/auth/subscriptions/GoogleSubscriptionsManager.kt b/auth/src/gplay/java/org/futo/circles/auth/subscriptions/GoogleSubscriptionsManager.kt
similarity index 100%
rename from auth/src/main/java/org/futo/circles/auth/subscriptions/GoogleSubscriptionsManager.kt
rename to auth/src/gplay/java/org/futo/circles/auth/subscriptions/GoogleSubscriptionsManager.kt
diff --git a/auth/src/main/java/org/futo/circles/auth/subscriptions/ProductDetailsMapping.kt b/auth/src/gplay/java/org/futo/circles/auth/subscriptions/ProductDetailsMapping.kt
similarity index 100%
rename from auth/src/main/java/org/futo/circles/auth/subscriptions/ProductDetailsMapping.kt
rename to auth/src/gplay/java/org/futo/circles/auth/subscriptions/ProductDetailsMapping.kt