diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml
index 54f8fea16..de378d181 100644
--- a/.github/workflows/build-test-lint.yaml
+++ b/.github/workflows/build-test-lint.yaml
@@ -22,7 +22,5 @@ jobs:
     with:
       platforms: "linux/amd64" # "linux/amd64,linux/arm64"
       webTarget: hyku-web
-      solr: true
-      solrTarget:
-      worker: true
+      solrTarget: hyku-solr
       workerTarget: hyku-worker
diff --git a/docker-compose.yml b/docker-compose.yml
index 9501c9c8c..0d349e7e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,6 +58,7 @@ services:
     build:
       context: solr
       dockerfile: Dockerfile
+      target: hyku-solr
     environment:
       - OOM=script
       - SOLR_ADMIN_USER=solr
diff --git a/solr/Dockerfile b/solr/Dockerfile
index e89995951..8b0cd3ae1 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -1,6 +1,6 @@
-FROM solr:8.3
+FROM solr:8.3 as hyku-solr
 ENV SOLR_USER="solr" \
     SOLR_GROUP="solr"
 USER root
 COPY --chown=solr:solr security.json /var/solr/data/security.json
-USER $SOLR_USER
\ No newline at end of file
+USER $SOLR_USER