diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 594be33a77dc8483e3cc880dbe5fed64f375ee46..a325ef379a68a953cde404bdf074f0c74f2dd3d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,6 +94,12 @@ dsl:deploy:
   only:
     changes:
       - src/languages/**/*
+  artifacts:
+    untracked: false
+    when: on_success
+    expire_in: "30 days"
+    paths:
+      - src/languages/de.evoal.languages.releng.site/target/de.evoal.languages.releng.site-*.zip
 
 
 #############################################################
@@ -150,45 +156,38 @@ evoal:deploy:
 #############################################################
 ## Remaining release steps
 
+all:package:
+  stage: Package
+  dependencies: ["evoal:deploy", "languages:deploy"]
+  tags:
+    - docker
+  image: $EVOAL_IMAGE
+  script:
+    - ci/create-release.sh "$CI_JOB_NAME"
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME.binaries.evoal.zip"
+    when: always
+    paths:
+      - evoal
 
-#evoal:package:
-#  stage: Package
-#  tags:
-#    - docker
-#  image: $EVOAL_IMAGE
-#  script:
-#    - mvn $MAVEN_CLI_OPTS -f $EVOAL_POM -DskipTests=true package
-#  artifacts:
-#    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME.binaries.evoal.zip"
-#    when: always
-#    paths:
-#      - src/core/de.evoal.main/target/main-*.jar
-#  only:
-#    changes:
-#      - src/core/**/*
-
-#.docker_login: &docker_login
-#  before_script: 
-#    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-#
-#evoal:docker:
-#  <<: *docker_login
-#  variables:    
-#    # Disable TLS
-#    DOCKER_TLS_CERTDIR: ""
-#    # allow to talk to docker service 
-#    DOCKER_HOST: tcp://localhost:2375
+
+
+#release:
 #  stage: Release
-#  tags:
-#    - docker
-#  image: docker:20
-#  services:
-#    - name: docker:20-dind
-#      alias: dindservice
+#  needs:
+#    - job: "dsl:deploy"
+#      artifacts: true
+#    - job: "evoal:deploy"
+#      artifacts: true
+#  image: registry.gitlab.com/gitlab-org/release-cli:latest
+#  rules:
+#    - if: $CI_COMMIT_TAG
 #  script:
-#    - docker -version
-#    - cd docker
-#    - docker build -f evoal.Dockerfile .
-#  only:
-#    changes:
-#      - src/core/**/*
+#    - echo "running release_job for $TAG"
+#  release:                                         # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties
+#    name: 'Release $CI_COMMIT_TAG'
+#    tag_name: 'v0.$CI_PIPELINE_IID'                # The version is incremented per pipeline.
+#    description: 'v0.$CI_PIPELINE_IID'
+#    ref: '$CI_COMMIT_TAG'                          # The tag is created from the pipeline SHA.
+
+
diff --git a/ci/create-release.sh b/ci/create-release.sh
new file mode 100644
index 0000000000000000000000000000000000000000..dc815cfa51ad8c935320b66b545850840f1631ec
--- /dev/null
+++ b/ci/create-release.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+RELEASE_PLUGINS=generator.main surrogate.api surrogate.simple surrogate.svr
+
+cp src/languages/de.evoal.languages.releng.site/target/de.evoal.languages.releng.site-*.zip "evoal/eclipse-update-site.zip"
+
+mkdir -p evoal/plugins
+cp -r src/core/de.evoal.core/target/core evoal/modules
+
+for NAME in $RELEASE_PLUGINS; do
+  cp -r de.evoal.$NAME/target/$NAME evoal/plugins/$NAME
+done
+
+rm evoal/modules/jboss-annotations-api*
+rm evoal/modules/javax.annotation-api-*
+rm evoal/modules/jsr305-*
+rm evoal/modules/jboss-interceptors-api*
+rm evoal/modules/jboss-el-api*
+rm evoal/modules/jboss-annotations-api*
+rm evoal/modules/javax.inject*
+
+# Now, we do have to do a small hack to fix an Xtext/jigsaw issue (multiple modules have classes
+#  in the same package which is not supported by jigsaw). Therefore, we merge the modules and create
+#  a single jar file.
+cd evoal
+mkdir xtext-merge
+pushd xtext-merge
+  unzip -o ../modules/org.eclipse.xtext.util-*.jar
+  unzip -o ../modules/org.eclipse.xtext-*.jar
+  rm ../modules/org.eclipse.xtext.util-*.jar
+  rm ../modules/org.eclipse.xtext-*.jar
+  zip -r9 ../modules/org.eclipse.xtext.jar *
+popd
+rm -rf xtext-merge
+
diff --git a/src/core/de.evoal.surrogate.neural/pom.xml b/src/core/de.evoal.surrogate.neural/pom.xml
index 7454dbb4aab59d39c8e3886a03206a84c0918827..5b627a8340522d2c476ee1999a6f1833d3ef0922 100644
--- a/src/core/de.evoal.surrogate.neural/pom.xml
+++ b/src/core/de.evoal.surrogate.neural/pom.xml
@@ -5,10 +5,8 @@
 
 	<parent>
 		<groupId>de.evoal</groupId>
-		<artifactId>releng.parent</artifactId>
+		<artifactId>core.plugin</artifactId>
 		<version>0.9.0-SNAPSHOT</version>
-
-		<relativePath>../de.evoal.releng.parent</relativePath>
 	</parent>
 
 	<artifactId>surrogate.neural</artifactId>