diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2434c24a499a190859ea7f7cef315e9089a086f3..f6370241154a9de7cbafee28116679bdfb8c72c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,26 +14,24 @@ variables:
   #     This will expose secret variables !
   #CI_DEBUG_TRACE: "true"
 
-  # Update site artifacts storage dir (local) 
-  UPSITE_ARTIFACTS_DIR: "artifacts__updatesite"
-
+  # Update site artifacts storage dir
+  # gitlab pages expects there to be a public/ directory
+  UPDATESITE_ARTIFACTS_DIR: "public"
 
 # default docker image. can be overriden per job.
 image: maven:3-jdk-11
 
-
-build:
-  stage: build
+pages:
   script:
-    - mvn -B -e -fae clean integration-test
-    #- mvn -B -e -fae -Dmaven.test.failure.ignore clean integration-test
-    #- mvn surefire-report:report-only -Daggregate
-    #- echo -e "Tests\tErrors\tFailures\tSkipped\tSuccess Rate\tTime"
-    #- tmp=$(cat target/site/surefire-report.html | grep  -A 17 -m 3 Summary | sed -n 12,17p | sed -e 's/<[^>]*>//g' | tr "\n" "\t")
-    # find update site and copy it to ./artifacts
-    - upsite_zip="`find releng/*.update/target -maxdepth 1 -name '*.update-*.zip' | head -1`"
-    - mkdir "${UPSITE_ARTIFACTS_DIR}" && cp "${upsite_zip}" "${UPSITE_ARTIFACTS_DIR}"
+    - mvn -B -e -fae clean package
+    - mkdir -p $UPDATESITE_ARTIFACTS_DIR
+    - mv releng/alpha.language.update/target/repository $UPDATESITE_ARTIFACTS_DIR/update-site
+    - echo 
   artifacts:
     paths:
-      - "${UPSITE_ARTIFACTS_DIR}"
-
+      # files to be exposed at the Page URL
+      - $UPDATESITE_ARTIFACTS_DIR
+  rules:
+    # This ensures that only pushes to the default branch will trigger
+    # a pages deploy
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
diff --git a/features/alpha.language.feature/feature.xml b/features/alpha.language.feature/feature.xml
index 4b000d18eafb2ce4f05fc90219d9d2cc4458053c..829eb1465abe817683511808b9394baba8f0e6ad 100644
--- a/features/alpha.language.feature/feature.xml
+++ b/features/alpha.language.feature/feature.xml
@@ -41,6 +41,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
       <import plugin="org.eclipse.xtext.xbase"/>
       <import plugin="org.eclipse.xtext.xbase.lib" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.util"/>
+      <import plugin="org.eclipse.xtend.core" version="2.22.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.lib" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext"/>
       <import plugin="org.eclipse.xtext.ide"/>
@@ -70,4 +71,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
    <plugin id="alpha.interactive" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
+   <plugin id="alpha.loader" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="alpha.targetmapping" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="alpha.targetmapping.xtext" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="alpha.targetmapping.xtext.ide" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="alpha.targetmapping.xtext.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
 </feature>