diff --git a/.github/workflows/create-release-draft.yml b/.github/workflows/create-release-draft.yml
index 54ac4aa0d2..a5ab87aed1 100644
--- a/.github/workflows/create-release-draft.yml
+++ b/.github/workflows/create-release-draft.yml
@@ -5,17 +5,22 @@ on:
     inputs:
       release_client:
         type: boolean
-        description: client
+        description: parachain-client
         required: true
         default: true
       release_runtime:
         type: boolean
-        description: runtime
+        description: parachain-runtime
+        required: true
+        default: true
+      release_worker:
+        type: boolean
+        description: tee-worker
         required: true
         default: true
       release_enclave:
         type: boolean
-        description: enclave
+        description: tee-enclave
         required: true
         default: true
       release_tag:
@@ -47,26 +52,24 @@ jobs:
       - name: set release_type
         id: vars
         run: |
-          release_type=""
-          if [ "${{ github.event.inputs.release_enclave }}" = "true" ] && [ "${{ github.event.inputs.release_client }}" = "true" ] && [ "${{ github.event.inputs.release_runtime }}" = "true" ]; then
-            release_type="all"
-          elif [ "${{ github.event.inputs.release_client }}" = "true" ] && [ "${{ github.event.inputs.release_runtime }}" = "true" ]; then
-            release_type="both"
-          elif [ "${{ github.event.inputs.release_client }}" = "true" ]; then
-            release_type="client"
-          elif [ "${{ github.event.inputs.release_runtime }}" = "true" ]; then
-            release_type="runtime"
-          elif [ "${{ github.event.inputs.release_enclave }}" = "true" ]; then
-            release_type="enclave"
-          else
+          # use something similar to mask to store the release type
+          t=0000
+          [ "${{ github.event.inputs.release_client }}" = "true" ] && t="${t:0:0}1${t:1}"
+          [ "${{ github.event.inputs.release_runtime }}" = "true" ] && t="${t:0:1}1${t:2}"
+          [ "${{ github.event.inputs.release_worker }}" = "true" ] && t="${t:0:2}1${t:3}"
+          [ "${{ github.event.inputs.release_enclave }}" = "true" ] && t="${t:0:3}1${t:4}"
+          if [ $t = "0000"]; then
             echo "::error::Please select at least one release type."
             exit 1
           fi
-          echo "release_type=${release_type}" >> $GITHUB_OUTPUT
+          echo "::group::print release type"
+          echo "release_type: $t"
+          echo "::endgroup::"
+          echo "release_type=$t" >> $GITHUB_OUTPUT
     outputs:
       release_type: ${{ steps.vars.outputs.release_type }}
 
-  ## build runtime wasm ##
+  ## build parachain runtime wasm ##
   build-wasm:
     if: ${{ github.event.inputs.release_runtime == 'true' }}
     runs-on: ubuntu-latest
@@ -85,7 +88,7 @@ jobs:
 
       - name: Build with srtool
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
+        uses: chevdor/srtool-actions@v0.8.0
         env:
           # optional: will override the parachain pallet ID and authorize_upgrade call ID,
           #           which will result in a different parachain_authorize_upgrade_hash
@@ -111,7 +114,7 @@ jobs:
             ${{ matrix.chain }}-parachain-srtool-digest.json
             ${{ matrix.chain }}-parachain-runtime.compact.compressed.wasm
 
-  ## build docker image of client binary ##
+  ## build docker image of parachain binary ##
   build-docker:
     if: ${{ github.event.inputs.release_client == 'true' }}
     runs-on: ubuntu-latest
@@ -129,7 +132,7 @@ jobs:
           docker images
 
       - name: Dockerhub login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -159,42 +162,53 @@ jobs:
             ${{ env.GENESIS_RELEASE }}-genesis-wasm
 
   ## Build the enclave and package config files
-  build-enclave:
-    if: ${{ github.event.inputs.release_enclave == 'true' }}
-    runs-on: prod-tee-1
-
+  build-tee:
+    if: ${{ github.event.inputs.release_worker == 'true' }} || ${{ github.event.inputs.release_enclave == 'true' }}
+    runs-on: tee-prod-builder
+    outputs:
+      mrenclave: ${{ steps.mrenclave.outputs.mrenclave }}
+      enclave_sha1sum: ${{ steps.shasum.outputs.enclave_sha1sum }}
+      worker_sha1sum: ${{ steps.shasum.outputs.worker_sha1sum }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
+      - name: Checkout codes on ${{ env.RELEASE_TAG }}
+        uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.manual_trigger }}
+          ref: ${{ env.RELEASE_TAG }}
+          fetch-depth: 0
 
-      - name: Generate Package
+      - name: Build release artefacts 
         run: | 
           source /opt/intel/sgxsdk/environment 
-          ./tee-worker/scripts/litentry/release/generate_release_pkg.sh
-          
-      - name: Archive Package
-        uses: actions/upload-artifact@v2
-        with:
-          name: tee-worker-${{ env.RELEASE_TAG }}.tar.gz
-          path: ./tee-worker/target/*.tar.gz
+          ./tee-worker/scripts/litentry/release/build.sh ${{ github.event.inputs.release_worker }} ${{ github.event.inputs.release_enclave }}
 
       - name: Set MRENCLAVE
         id: mrenclave
         run: |
-          cd tee-worker 
-          echo "mrenclave=$(make mrenclave)" >> $GITHUB_OUTPUT
+          MRENCLAVE=
+          f="tee-worker/enclave_release/mrenclave.txt"
+          [ -f "$f" ] && MRENCLAVE=$(cat "$f")
+          echo "mrenclave=$MRENCLAVE" >> $GITHUB_OUTPUT
 
-      - name: Set RUSTC version
-        id: rustc
+      - name: Set shasum
+        id: shasum
         run: |
-          RUSTC_VERSION=$(rustc --version | cut -d' ' -f2)
-          echo "rustc_version=$RUSTC_VERSION" >> $GITHUB_OUTPUT
+          ENCLAVE_SHA1SUM=
+          WORKER_SHA1SUM=
+          cd tee-worker/enclave_release
+          [ -f "enclave.signed.so" ] && ENCLAVE_SHA1SUM=$(shasum enclave.signed.so | awk '{print $1}')
+          [ -f "litentry-worker" ] && WORKER_SHA1SUM=$(shasum litentry-worker | awk '{print $1}')
+          echo "enclave_sha1sum=$ENCLAVE_SHA1SUM" >> $GITHUB_OUTPUT
+          echo "worker_sha1sum=$WORKER_SHA1SUM" >> $GITHUB_OUTPUT
 
-    outputs:
-      mrenclave: ${{ steps.mrenclave.outputs.mrenclave }}
-      rustc_version: ${{ steps.rustc.outputs.rustc_version }}
+      - name: Upload artefacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: litentry-tee
+          path: ./tee-worker/enclave_release/*
+
+      - name: Fail early
+        if: failure()
+        uses: andymckay/cancel-action@0.3
   
   ## test again the built docker image ##
   run-ts-tests:
@@ -211,6 +225,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Enable corepack and pnpm
+        run: corepack enable && corepack enable pnpm
+
       - name: Download and tag docker image
         run: |
           docker pull litentry/litentry-parachain:${{ env.RELEASE_TAG }}
@@ -253,6 +270,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ env.RELEASE_TAG }}
+
       - name: Prepare output and compare the metadata
         timeout-minutes: 3
         run: |
@@ -308,12 +326,12 @@ jobs:
     # seems to be the only way to achieve this
     needs:
       - set-release-type
-      - build-enclave
+      - build-tee
       - run-ts-tests
       - build-wasm 
     if: |
       !failure()  &&
-      (success('build-wasm') || success('run-ts-tests') || success('build-enclave'))
+      (success('build-wasm') || success('run-ts-tests') || success('build-tee'))
     steps:
       - name: Checkout codes on ${{ env.RELEASE_TAG }}
         uses: actions/checkout@v4
@@ -326,11 +344,12 @@ jobs:
       
       - name: Generate release notes
         run: |
-          export FILENAME=$(find "tee-worker-${{ env.RELEASE_TAG }}.tar.gz/" -type f -name "release-*.tar.gz" -print -quit)
-          export MRENCLAVE_OUTPUT="${{ needs.build-enclave.outputs.mrenclave }}"
+          export MRENCLAVE="${{ needs.build-tee.outputs.mrenclave }}"
+          export ENCLAVE_SHA1SUM="${{ needs.build-tee.outputs.enclave_sha1sum }}"
+          export WORKER_SHA1SUM="${{ needs.build-tee.outputs.worker_sha1sum }}"
           ./scripts/generate-release-notes.sh ${{ github.workspace }}/.github/release_notes.md ${{ needs.set-release-type.outputs.release_type }} ${{ env.DIFF_TAG }}
         env:
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create release draft
         id: create-release-draft
@@ -344,4 +363,4 @@ jobs:
             *-parachain-runtime/*-parachain-srtool-digest.json
             *-parachain-runtime/*-parachain-runtime.compact.compressed.wasm
             litentry-collator/*
-            tee-worker-${{ env.RELEASE_TAG }}.tar.gz/*
+            litentry-tee/*
diff --git a/scripts/generate-release-notes.sh b/scripts/generate-release-notes.sh
index 550b863c29..53c1e8813c 100755
--- a/scripts/generate-release-notes.sh
+++ b/scripts/generate-release-notes.sh
@@ -18,7 +18,26 @@ cd "$ROOTDIR"
 
 REPO=https://github.com/litentry/litentry-parachain
 
-if [ "$2" != "runtime" ] && [ "$2" != "enclave" ]; then
+type=$2
+
+# helper functions to parse the type mask
+is_client_release() {
+  [ "${type:0:1}" = "1" ]
+}
+
+is_runtime_release() {
+  [ "${type:1:1}" = "1" ]
+}
+
+is_worker_release() {
+  [ "${type:2:1}" = "1" ]
+}
+
+is_enclave_release() {
+  [ "${type:3:1}" = "1" ]
+}
+
+if is_client_release; then
   # base image used to build the node binary
   NODE_BUILD_BASE_IMAGE=$(grep FROM docker/Dockerfile | head -n1 | sed 's/^FROM //;s/ as.*//')
 
@@ -42,29 +61,45 @@ CUMULUS_DEP=$(grep -F 'https://github.com/paritytech/cumulus' node/Cargo.toml |
 
 echo > "$1"
 echo "## This is a release for:" >> "$1"
-if [ "$2" != "runtime" ] && [ "$2" != "enclave" ]; then
-  echo "- [x] Client" >> "$1"
+if is_client_release; then
+  echo "- [x] Parachain client" >> "$1"
+else
+  echo "- [ ] Parachain client" >> "$1"
+fi
+if is_runtime_release; then
+  echo "- [x] Parachain runtime" >> "$1"
 else
-  echo "- [ ] Client" >> "$1"
+  echo "- [ ] Parachain runtime" >> "$1"
 fi
-if [ "$2" != "client" ] && [ "$2" != "enclave" ]; then
-  echo "- [x] Runtime" >> "$1"
+if is_worker_release; then
+  echo "- [x] TEE worker" >> "$1"
 else
-  echo "- [ ] Runtime" >> "$1"
+  echo "- [ ] TEE worker" >> "$1"
 fi
-if [ "$2" = "enclave" ] || [ "$2" == "all" ]; then 
-  echo "- [x] Enclave" >> "$1"
-else 
-  echo "- [ ] Enclave" >> "$1"
+if is_enclave_release; then
+  echo "- [x] TEE enclave" >> "$1"
+else
+  echo "- [ ] TEE enclave" >> "$1"
 fi
 echo >> "$1"
 
 # use <CODE> to decorate around the stuff and then replace it with `
 # so that it's not executed as commands inside heredoc
 
-if [ "$2" != "runtime" ] && [ "$2" != "enclave" ]; then
+cat << EOF >> "$1"
+## Dependencies
+
+<CODEBLOCK>
+Substrate                    : $SUBSTRATE_DEP
+Polkadot                     : $POLKADOT_DEP
+Cumulus                      : $CUMULUS_DEP
+<CODEBLOCK>
+
+EOF
+
+if is_client_release; then
   cat << EOF >> "$1"
-## Client
+## Parachain client
 
 <CODEBLOCK>
 version                      : $NODE_VERSION
@@ -77,8 +112,8 @@ docker image                 : litentry/litentry-parachain:$RELEASE_TAG
 EOF
 fi
 
-if [ "$2" != "client" ] && [ "$2" != "enclave" ]; then
-  echo "## Runtime" >> "$1"
+if is_runtime_release; then
+  echo "## Parachain runtime" >> "$1"
   for CHAIN in litmus rococo litentry; do
     SRTOOL_DIGEST_FILE=$CHAIN-parachain-runtime/$CHAIN-parachain-srtool-digest.json
     RUNTIME_VERSION=$(grep spec_version runtime/$CHAIN/src/lib.rs | sed 's/.*version: //;s/,//')
@@ -105,17 +140,6 @@ EOF
   done
 fi
 
-cat << EOF >> "$1"
-## Dependencies
-
-<CODEBLOCK>
-Substrate                    : $SUBSTRATE_DEP
-Polkadot                     : $POLKADOT_DEP
-Cumulus                      : $CUMULUS_DEP
-<CODEBLOCK>
-
-EOF
-
 if [ "$GENESIS_RELEASE" != "none" ]; then
   if [ "$2" = "runtime" ]; then
     echo "genesis release requires to build client"
@@ -138,7 +162,7 @@ if [ "$GENESIS_RELEASE" != "none" ]; then
     exit 1
   fi
   cat << EOF >> "$1"
-## Genesis artefacts
+## Parachain genesis artefacts
 
 <CODEBLOCK>
 sha1sum of genesis state  : $GENESIS_STATE_HASH
@@ -148,28 +172,35 @@ sha1sum of genesis wasm   : $GENESIS_WASM_HASH
 EOF
 fi
 
-# release notes for enclave binary 
-if [ "$2" = "enclave" ] || [ "$2" = "all" ]; then 
-   echo "Generating Release Notes for Enclave"
-   MRENCLAVE=$(echo "$MRENCLAVE_OUTPUT" | awk '{print $2}')
-   RUSTC_VERSION=$(grep -o 'channel = "[^"]*"' tee-worker/rust-toolchain.toml | cut -d '"' -f 2)
-   # get Sha256 hash of the code 
-   TEMP_DIR=$(mktemp -d)
-   tar -xzf "$FILENAME" -C "$TEMP_DIR" || { echo "Error extracting '$FILENAME'."; exit 1; }
-   FILE=$(cd $TEMP_DIR && ls) 
-   HASH_VALUE_ENCLAVE=$(find "$TEMP_DIR/$FILE/enclave.signed.so" -type f -print0 | sort -z | xargs -0 sha256sum | sha256sum | cut -d ' ' -f 1)
-   HASH_VALUE_WORKER=$(find "$TEMP_DIR/$FILE/litentry-worker" -type f -print0 | sort -z | xargs -0 sha256sum | sha256sum | cut -d ' ' -f 1)
-   rm -rf "$TEMP_DIR"
-
-   cat << EOF >> "$1" 
-## TEE Worker Release 
+if is_worker_release; then
+  WORKER_VERSION=$(grep version tee-worker/service/Cargo.toml | head -n1 | sed "s/'$//;s/.*'//")
+  WORKER_BIN=$(grep name tee-worker/service/Cargo.toml | head -n1 | sed "s/'$//;s/.*'//")
+  WORKER_RUSTC_VERSION=$(cd tee-worker && rustc --version)
+  UPSTREAM_COMMIT=$(cat tee-worker/upstream_commit)
+cat << EOF >> "$1"
+## TEE worker
 
 <CODEBLOCK>
-rustc                        : $RUSTC_VERSION
+version                      : $WORKER_VERSION
+name                         : $WORKER_BIN
+rustc                        : $WORKER_RUSTC_VERSION
+sha1sum                      : $WORKER_SHA1SUM
+upstream commit:             : $UPSTREAM_COMMIT
+<CODEBLOCK>
+
+EOF
+fi
+
+if is_enclave_release; then
+  ENCLAVE_VERSION=$(grep spec_version tee-worker/app-libs/sgx-runtime/src/lib.rs | sed 's/.*version: //;s/,//')
+cat << EOF >> "$1"
+## TEE enclave
+
+<CODEBLOCK>
+version                      : $ENCLAVE_VERSION
+sha1sum                      : $ENCLAVE_SHA1SUM
 mrenclave                    : $MRENCLAVE
-sha256(enclave)              : $HASH_VALUE_ENCLAVE
-sha256(worker)               : $HASH_VALUE_WORKER
-<CODEBLOCK> 
+<CODEBLOCK>
 
 EOF
 fi
diff --git a/tee-worker/Cargo.lock b/tee-worker/Cargo.lock
index 379d2b373e..951ddd6a76 100644
--- a/tee-worker/Cargo.lock
+++ b/tee-worker/Cargo.lock
@@ -6716,7 +6716,7 @@ checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
 
 [[package]]
 name = "litentry-cli"
-version = "0.9.0"
+version = "0.0.1"
 dependencies = [
  "array-bytes 6.1.0",
  "base58",
@@ -6794,7 +6794,7 @@ dependencies = [
 
 [[package]]
 name = "litentry-worker"
-version = "0.9.0"
+version = "0.0.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -13229,9 +13229,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
 dependencies = [
  "bitvec",
  "cfg-if 1.0.0",
@@ -13243,9 +13243,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/tee-worker/Makefile b/tee-worker/Makefile
index e0a8e1b2b4..83690bb0dd 100755
--- a/tee-worker/Makefile
+++ b/tee-worker/Makefile
@@ -203,10 +203,11 @@ $(Signed_RustEnclave_Name): $(RustEnclave_Name)
 	@echo "SGX_SIGN_KEY: $(SGX_SIGN_KEY)"
 
 
+# TODO: figure out if/how to use the passphrase file in PROD
 ifeq ($(SGX_PRODUCTION), 1)
 	$(SGX_ENCLAVE_SIGNER) gendata -enclave $(RustEnclave_Name) -out enclave_sig.dat -config $(SGX_ENCLAVE_CONFIG)
-	openssl rsa -passin file:$(SGX_SIGN_PASSFILE) -pubout -in $(SGX_SIGN_KEY) -out intel_sgx.pub
-	openssl dgst -sha256 -passin file:$(SGX_SIGN_PASSFILE) -sign $(SGX_SIGN_KEY) -out signature.dat enclave_sig.dat
+	openssl rsa -pubout -in $(SGX_SIGN_KEY) -out intel_sgx.pub
+	openssl dgst -sha256 -sign $(SGX_SIGN_KEY) -out signature.dat enclave_sig.dat
 	openssl dgst -sha256 -verify intel_sgx.pub -signature signature.dat enclave_sig.dat
 	$(SGX_ENCLAVE_SIGNER) catsig -enclave $(RustEnclave_Name) -config $(SGX_ENCLAVE_CONFIG) -out $@ -key intel_sgx.pub -sig signature.dat -unsigned enclave_sig.dat
 else
diff --git a/tee-worker/app-libs/sgx-runtime/src/lib.rs b/tee-worker/app-libs/sgx-runtime/src/lib.rs
index 6c08f40b17..6d228312fc 100644
--- a/tee-worker/app-libs/sgx-runtime/src/lib.rs
+++ b/tee-worker/app-libs/sgx-runtime/src/lib.rs
@@ -139,7 +139,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("node-template"),
 	impl_name: create_runtime_str!("node-template"),
 	authoring_version: 1,
-	spec_version: 1,
+	spec_version: 100,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
diff --git a/tee-worker/cli/Cargo.toml b/tee-worker/cli/Cargo.toml
index b9930fd87c..238ff8a0ef 100644
--- a/tee-worker/cli/Cargo.toml
+++ b/tee-worker/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "litentry-cli"
-version = "0.9.0"
+version = "0.0.1"
 authors = ['Trust Computing GmbH <info@litentry.com>', 'Integritee AG <hello@integritee.network>']
 edition = "2021"
 
diff --git a/tee-worker/enclave-runtime/Cargo.lock b/tee-worker/enclave-runtime/Cargo.lock
index e267368b5d..44fcc204f9 100644
--- a/tee-worker/enclave-runtime/Cargo.lock
+++ b/tee-worker/enclave-runtime/Cargo.lock
@@ -3702,9 +3702,9 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "scale-info"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
 dependencies = [
  "bitvec",
  "cfg-if 1.0.0",
@@ -3716,9 +3716,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/tee-worker/scripts/litentry/release/build.sh b/tee-worker/scripts/litentry/release/build.sh
new file mode 100755
index 0000000000..aafd70210d
--- /dev/null
+++ b/tee-worker/scripts/litentry/release/build.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# this script builds the release artefacts for TEE client and/or the enclave
+
+set -euo pipefail
+
+function usage() {
+  echo "Usage: $0 if-build-worker if-build-enclave"
+  echo "Example:"
+  echo "       $0 true true"
+}
+
+[ $# -ne 2 ] && (usage; exit 1)
+
+echo "build worker: $1"
+echo "build enclave: $2"
+
+ROOTDIR=$(git rev-parse --show-toplevel)
+WORKERDIR="$ROOTDIR/tee-worker"
+
+# hardcoded sgx signing key, adjust it accordingly if you call the script manually
+SGX_COMMERCIAL_KEY="/opt/enclave_release/sgx_sign_key.pem"
+
+if [ ! -f "$SGX_COMMERCIAL_KEY" ]; then
+    echo "Cannot find SGX sign key under $SGX_COMMERCIAL_KEY"
+    exit 1
+fi
+
+DESTDIR="$WORKERDIR/enclave_release"
+[ -d "$DESTDIR" ] && rm -rf "$DESTDIR"
+mkdir -p "$DESTDIR"
+
+cd "$WORKERDIR"
+
+make clean
+
+export SGX_PRODUCTION=1
+export SGX_COMMERCIAL_KEY="$SGX_COMMERCIAL_KEY"
+if [ "$1" = "true" ]; then
+    make service
+    cp bin/litentry-worker "$DESTDIR"
+fi
+if [ "$2" = "true" ]; then
+    make bin/enclave.signed.so
+    cp bin/enclave.signed.so "$DESTDIR"
+    make mrenclave 2>&1 | grep MRENCLAVE | awk '{print $2}' > "$DESTDIR/mrenclave.txt"
+fi
+
+echo "Build tee done"
+ls -l "$DESTDIR"
diff --git a/tee-worker/scripts/litentry/release/generate_release_pkg.sh b/tee-worker/scripts/litentry/release/generate_release_pkg.sh
deleted file mode 100755
index 2bb824128e..0000000000
--- a/tee-worker/scripts/litentry/release/generate_release_pkg.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-ROOT_DIR=$(git rev-parse --show-toplevel)
-WORKER_DIR="${ROOT_DIR}/tee-worker"
-
-# Edit the following variable(s):
-COMMERCIAL_KEY_PATH=${WORKER_DIR}/enclave-runtime/Enclave_private.pem
-
-##############################################################################
-# Don't edit anything from here
-
-CURRENT_DATE=$(date "+%Y%m%d")
-GIT_HASH=$(git rev-parse --short HEAD)
-RELEASE_DIR_NAME=release-${CURRENT_DATE}-${GIT_HASH}
-RELEASE_DIR=${WORKER_DIR}/target/${RELEASE_DIR_NAME}
-
-mkdir -p ${RELEASE_DIR}
-
-cd "$WORKER_DIR"
-
-# Build target files in production mode
-SGX_PRODUCTION=1 SGX_COMMERCIAL_KEY=${COMMERCIAL_KEY_PATH} make
-
-# Copy files
-for Item in 'enclave.signed.so' 'litentry-worker'; do
-    cp "${WORKER_DIR}/bin/${Item}" "${RELEASE_DIR}"
-done
-for Item in 'prepare.sh' 'config.json.eg' 'ReadMe.md'; do
-    cp -r "${WORKER_DIR}/scripts/litentry/release/${Item}" "${RELEASE_DIR}"
-done
-
-cp -r "${ROOT_DIR}/scripts/ts-utils" "${RELEASE_DIR}"
-
-make mrenclave | grep -oP '^MRENCLAVE: \K.*$$' > "${RELEASE_DIR}/mrenclave.txt"
-
-cd ${WORKER_DIR}/target/
-tar -czf ${RELEASE_DIR_NAME}.tar.gz ${RELEASE_DIR_NAME}
-
-echo "Release package generate: ${RELEASE_DIR}.tar.gz"
-
diff --git a/tee-worker/service/Cargo.toml b/tee-worker/service/Cargo.toml
index b716aa1106..11d9753e81 100644
--- a/tee-worker/service/Cargo.toml
+++ b/tee-worker/service/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-name = "litentry-worker"
-version = "0.9.0"
+name = 'litentry-worker'
+version = '0.0.1'
 authors = ['Trust Computing GmbH <info@litentry.com>', 'Integritee AG <hello@integritee.network>']
-build = "build.rs"
-edition = "2021"
+build = 'build.rs'
+edition = '2021'
 
 [dependencies]
 async-trait = "0.1.50"
@@ -28,7 +28,6 @@ thiserror = "1.0"
 tokio = { version = "1.6.1", features = ["full"] }
 warp = "0.3"
 
-
 # ipfs
 ipfs-api = "0.11.0"