diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml
index 448709c..4c6723f 100644
--- a/.github/workflows/ci_test.yml
+++ b/.github/workflows/ci_test.yml
@@ -41,8 +41,5 @@
       - name: Build and install Koral
         run: mvn --file Koral/pom.xml install
 
-      - name: Build and package Kustvakt full
-        run: mvn clean --file Kustvakt/pom.xml package
-
-      - name: Build and package Kustvakt lite
-        run: mvn clean --file Kustvakt/pom.xml package -P lite -DskipTests=true
+      - name: Build and package Kustvakt
+        run: mvn clean --file Kustvakt/pom.xml package      
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 885e4e8..b0ac593 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,12 +23,8 @@
     - apk update
     - apk add --no-cache git
   script:
-    - docker build -f Dockerfile -t korap/kustvakt:$VID -t korap/kustvakt:$VID-full -t korap/kustvakt:latest-full --target kustvakt-full .
-    - docker save korap/kustvakt:$VID-full | xz -T0 -M16G -9 > kustvakt-full.tar.xz
-    - docker build -f Dockerfile -t korap/kustvakt:$VID -t korap/kustvakt:$VID-lite -t korap/kustvakt:latest-lite --target kustvakt-lite .
-    - docker save korap/kustvakt:$VID-lite | xz -T0 -M16G -9 > kustvakt-lite.tar.xz
+    - docker build -f Dockerfile -t korap/kustvakt:$VID -t korap/kustvakt:latest .
+    - docker save korap/kustvakt:$VID | xz -T0 -M16G -9 > kustvakt.tar.xz
   artifacts:
     paths:
-      - kustvakt-lite.tar.xz
-      - kustvakt-full.tar.xz
-
+      - kustvakt.tar.xz
\ No newline at end of file
diff --git a/Changes b/Changes
index 7e88b0c..c909feb 100644
--- a/Changes
+++ b/Changes
@@ -20,6 +20,7 @@
 - Add apiVersion for checking VC in caching process (#806)
 - Update system-vc and fix get statistics with VC reference test.
 - Merge full and lite profiles and create one jar for both. 
+- Merge full and lite version in dockerfile and CI tests
 
 
 # version 0.79.1
diff --git a/Dockerfile b/Dockerfile
index ae5beb1..1663273 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,14 @@
     mvn clean install
 
 RUN rm -r Koral-* v*.zip
-
+    
+#RUN curl -L -o koral-head.zip https://github.com/KorAP/Koral/archive/HEAD.zip && \
+#    unzip koral-head.zip && \
+#    cd Koral-* && \
+#    mvn clean install && \
+#    cd /kustvakt && \
+#    rm -rf Koral-* koral-head.zip
+    
 RUN mkdir built
 
 # Install Krill
@@ -42,18 +49,15 @@
 
 RUN rm -r Krill-* v*.zip
 
-# Package lite
-RUN mvn clean package -P lite && \
-    find target/Kustvakt-lite-*.jar -exec mv {} /kustvakt/built/Kustvakt-lite.jar ';'
 
-RUN sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' src/main/resources/kustvakt-lite.conf \
+# Kustvakt
+RUN mvn clean package -DskipTests=true && \
+    find target/Kustvakt-*.jar -exec mv {} /kustvakt/built/Kustvakt.jar ';'
+
+ RUN sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' src/main/resources/kustvakt-lite.conf \
     > built/kustvakt-lite.conf
 
-# Package full
-RUN mvn clean package -DskipTests=true && \
-    find target/Kustvakt-full-*.jar -exec mv {} /kustvakt/built/Kustvakt-full.jar ';'
-
-RUN cat src/main/resources/kustvakt.conf | \
+ RUN cat src/main/resources/kustvakt.conf | \
     sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' | \
     sed 's!\(ldap\.config\s*=\).\+!\1\/kustvakt\/ldap\/ldap\.conf!' | \
     sed 's!\(oauth2\.initial\.super\.client\s*=\).\+!\1\/true!' | \
@@ -79,7 +83,7 @@
 RUN rm -r src && \
     rm -r wiki-index
 
-FROM busybox:latest AS example-index
+FROM eclipse-temurin:22-jre-alpine AS example-index
 
 WORKDIR /kustvakt
 
@@ -90,11 +94,7 @@
 
 COPY --from=builder /kustvakt/sample-index /kustvakt/index
 
-USER kustvakt
-
-CMD ["sh"]
-
-FROM eclipse-temurin:22-jre-alpine AS kustvakt-lite
+FROM eclipse-temurin:22-jre-alpine AS kustvakt
 
 RUN addgroup -S korap && \
     adduser -S kustvakt -G korap && \
@@ -103,43 +103,22 @@
 
 WORKDIR /kustvakt
 
-COPY --from=builder /kustvakt/built/Kustvakt-lite.jar /kustvakt/
-COPY --from=builder /kustvakt/built/kustvakt-lite.conf /kustvakt/
-COPY --from=builder /kustvakt/built/Krill-Indexer.jar /kustvakt/
-
 USER kustvakt
 
-EXPOSE 8089
+RUN mkdir ./ldap && \
+    mkdir ./client && \
+    mkdir ./data
 
-ENTRYPOINT [ "java", "-jar" ]
-
-CMD [ "Kustvakt-lite.jar" ]
-
-FROM eclipse-temurin:22-jre-alpine AS kustvakt-full
-
-RUN addgroup -S korap && \
-    adduser -S kustvakt -G korap && \
-    mkdir kustvakt && \
-    chown -R kustvakt.korap /kustvakt
-
-WORKDIR /kustvakt
-
-RUN mkdir ./ldap \
-    mkdir ./client
-
-COPY --from=builder /kustvakt/built/Kustvakt-full.jar /kustvakt/
-COPY --from=builder /kustvakt/built/kustvakt.conf /kustvakt/
+COPY --from=builder /kustvakt/built/Kustvakt.jar /kustvakt/
+COPY --from=builder /kustvakt/built/kustvakt.conf /kustvakt/data/
+COPY --from=builder /kustvakt/built/kustvakt-lite.conf /kustvakt/data/
 COPY --from=builder /kustvakt/built/ldap.* /kustvakt/ldap/
 COPY --from=builder /kustvakt/built/Krill-Indexer.jar /kustvakt/
 
-USER kustvakt
-
 EXPOSE 8089
 
-ENTRYPOINT [ "java", "-jar" ]
+ENTRYPOINT [ "java", "-jar",  "/kustvakt/Kustvakt.jar"]
 
-CMD [ "Kustvakt-full.jar" ]
-
-# docker build -f Dockerfile -t korap/kustvakt:{nr}-full --target kustvakt-full .
-# docker build -f Dockerfile -t korap/kustvakt:{nr} --target kustvakt-lite .
+# docker build -f Dockerfile -t korap/kustvakt:{nr} .
 # docker build -f Dockerfile -t korap/example-index:{nr} --target example-index .
+# docker run --rm --net host -v [absolute-path-sample-index]:/kustvakt/index -it korap/kustvakt:{nr} --lite
\ No newline at end of file