diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4489eb975..9aa2ad2f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -113,7 +113,11 @@ jobs:
           path: packages/openchs-android/android/app/build/generated/sourcemaps/react/<< pipeline.parameters.flavor >>Release/index.android.bundle.map
           destination: sourcemap-<< pipeline.parameters.flavor >>-staging-<< pipeline.git.revision >>.map
 
+<<<<<<< HEAD
   release_android_gramin_staging:
+=======
+  release_android_rwb_staging:
+>>>>>>> 48c92698 (#1267 | Gramin staging apk generation)
     docker:
       - image: cimg/android:2022.12-node
     working_directory: ~/avni-client
@@ -132,8 +136,8 @@ jobs:
             - v1-dependencies-
       - run: sudo chmod a+x packages/openchs-android/android/gradlew
       - run: sudo npm i -g react-native-cli
-      - run: make deps_ci release_gramin_staging_dev_without_clean
-      - run: make deploy_platform_translations_gramin_staging
+      - run: make deps_ci release_rwb_staging_dev_without_clean
+      - run: make deploy_platform_translations_rwb_staging
       - save_cache:
           key: v1-dependencies-{{ checksum "packages/openchs-android/android/app/build.gradle" }}-staging
           paths:
@@ -333,7 +337,7 @@ workflows:
                 - /^dependabot.*/
           requires:
             - test_android
-      - release_android_gramin_staging:
+      - release_android_rwb_staging:
           filters:
             branches:
               ignore:
diff --git a/Makefile b/Makefile
index 19bb6a5bf..a4706669c 100644
--- a/Makefile
+++ b/Makefile
@@ -133,8 +133,13 @@ as_perf: ; $(call _create_config,perf)
 as_prod: ; $(call _create_config,prod)
 as_prod_dev: ; $(call _create_config,prod_dev)
 as_no_env: ; $(call _create_config,no_env)
+<<<<<<< HEAD
 as_prod_lfe_dev: ; $(call _create_config,prod_lfe_dev)
 
+=======
+as_gramin_staging: ; $(call _create_config,gramin_staging)
+as_gramin_staging_dev: ; $(call _create_config,gramin_staging_dev)
+>>>>>>> 48c92698 (#1267 | Gramin staging apk generation)
 release_clean: ## If you get dex errors
 	rm -rf packages/openchs-android/android/app/build
 	mkdir -p packages/openchs-android/android/app/build/generated
@@ -214,6 +219,14 @@ release_staging_dev_without_clean: as_staging_dev
 
 release_staging: renew_env release_staging_without_clean
 
+release_gramin_staging_without_clean: as_gramin_staging
+	enableSeparateBuildPerCPUArchitecture=false flavor=gramin make release
+
+release_gramin_staging_dev_without_clean: as_gramin_staging_dev
+	enableSeparateBuildPerCPUArchitecture=false flavor=gramin make release
+
+release_gramin_staging: renew_env release_gramin_staging_without_clean
+
 release_uat_without_clean: as_uat
 	$(call _create_config,uat)
 	enableSeparateBuildPerCPUArchitecture=false make release
@@ -461,7 +474,7 @@ endif
 deploy_platform_translations_staging:
 	make deploy_translations server=https://staging.avniproject.org port=443 username=admin password=$(OPENCHS_STAGING_ADMIN_PASSWORD)
 
-deploy_platform_translations_gramin_staging:
+deploy_platform_translations_rwb_staging:
 	make deploy_translations server=https://staging.rwb.avniproject.org port=443 username=admin password=$(RWB_STAGING_ADMIN_PASSWORD)
 
 deploy_platform_translations_uat:
diff --git a/packages/openchs-android/config/env/gramin_staging.json b/packages/openchs-android/config/env/gramin_staging.json
new file mode 100644
index 000000000..52f37b00c
--- /dev/null
+++ b/packages/openchs-android/config/env/gramin_staging.json
@@ -0,0 +1,4 @@
+{
+  "SERVER_URL": "https://staging.rwb.avniproject.org",
+  "ENV": "rwb_staging"
+}
diff --git a/packages/openchs-android/config/env/gramin_staging_dev.json b/packages/openchs-android/config/env/gramin_staging_dev.json
new file mode 100644
index 000000000..811221d80
--- /dev/null
+++ b/packages/openchs-android/config/env/gramin_staging_dev.json
@@ -0,0 +1,4 @@
+{
+  "SERVER_URL": "https://staging.rwb.avniproject.org",
+  "ENV": "ext-dev"
+}