diff --git a/android/dataclerk/build.gradle.kts b/android/dataclerk/build.gradle.kts
index 052cabae04..00cf03ec3c 100644
--- a/android/dataclerk/build.gradle.kts
+++ b/android/dataclerk/build.gradle.kts
@@ -153,15 +153,15 @@ android {
       dimension = "apps"
       applicationIdSuffix = ".exposedInfantDev"
       versionNameSuffix = "-exposedInfantDev"
-      versionCode = 3
-      versionName = "0.0.3"
+      versionCode = 5
+      versionName = "0.0.5-alpha1"
     }
     create("artClientDev") {
       dimension = "apps"
       applicationIdSuffix = ".artClientDev"
       versionNameSuffix = "-artClientDev"
-      versionCode = 3
-      versionName = "0.0.3"
+      versionCode = 5
+      versionName = "0.0.5-alpha1"
     }
     create("exposedInfantStaging") {
       dimension = "apps"
@@ -192,17 +192,17 @@ dependencies {
 
   implementation("androidx.core:core-ktx:1.13.1")
   implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.20"))
-  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.1")
-  implementation("androidx.activity:activity-compose:1.9.0")
+  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
+  implementation("androidx.activity:activity-compose:1.9.1")
 
   implementation(Deps.accompanist.swiperefresh)
 
-  implementation(platform("androidx.compose:compose-bom:2024.05.00"))
+  implementation(platform("androidx.compose:compose-bom:2024.06.00"))
   implementation("androidx.compose.ui:ui")
   implementation("androidx.compose.ui:ui-graphics")
   implementation("androidx.compose.ui:ui-tooling-preview")
   implementation("androidx.compose.material3:material3")
-  implementation("androidx.paging:paging-compose:3.3.0")
+  implementation("androidx.paging:paging-compose:3.3.2")
 
   implementation("com.github.anrwatchdog:anrwatchdog:1.4.0")
 
diff --git a/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/DataClerkApplication.kt b/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/DataClerkApplication.kt
index a5b5cea552..db3c10f75b 100644
--- a/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/DataClerkApplication.kt
+++ b/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/DataClerkApplication.kt
@@ -27,7 +27,7 @@ import com.google.firebase.ktx.Firebase
 import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
-import org.dtree.fhircore.dataclerk.data.QuestXFhirQueryResolver
+import org.smartregister.fhircore.engine.data.remote.fhir.resource.FhirXFhirQueryResolver
 import org.smartregister.fhircore.engine.data.remote.fhir.resource.ReferenceUrlResolver
 import org.smartregister.fhircore.engine.trace.ReleaseTree
 import org.smartregister.fhircore.engine.ui.questionnaire.QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl
@@ -42,7 +42,7 @@ class DataClerkApplication : Application(), DataCaptureConfig.Provider, Configur
 
   @Inject lateinit var referenceUrlResolver: ReferenceUrlResolver
 
-  @Inject lateinit var xFhirQueryResolver: QuestXFhirQueryResolver
+  @Inject lateinit var xFhirQueryResolver: FhirXFhirQueryResolver
 
   @Inject lateinit var customQuestItemDataProvider: CustomQuestItemDataProvider
 
diff --git a/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/data/QuestXFhirQueryResolver.kt b/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/data/QuestXFhirQueryResolver.kt
deleted file mode 100644
index 9115dac074..0000000000
--- a/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/data/QuestXFhirQueryResolver.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2021 Ona Systems, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.dtree.fhircore.dataclerk.data
-
-import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.datacapture.XFhirQueryResolver
-import com.google.android.fhir.search.search
-import javax.inject.Inject
-import javax.inject.Singleton
-import org.hl7.fhir.r4.model.Resource
-
-@Singleton
-class QuestXFhirQueryResolver @Inject constructor(val fhirEngine: FhirEngine) : XFhirQueryResolver {
-  override suspend fun resolve(xFhirQuery: String): List<Resource> {
-    return fhirEngine.search(xFhirQuery).map { it.resource }
-  }
-}