diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e639f9..1f9f546 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ stages:
   - deploy
 
 # define the build stage
+
 build_stage:
   stage: build
   # use node docker image as enviroment
@@ -18,46 +19,53 @@ build_stage:
   artifacts:
     paths:
       - .output/
+      - .nuxt/
 
   # restrict to specific branch
-  only:
-    - master
+#  only:
+#    - master
 
 # define the deploy stage
-deploy_stage:
+deploy_staging:
   stage: deploy
-  # use our deploy image
+  environment:
+    name: staging
+    url: https://next.rockfic.com
   image: ubuntu:latest
-  # install needed packages
-  # add the SSH key from the variable SSH_DEPLOY_KEY and disable StrictHostKeyChecking
-  before_script:
-    - apt-get update && apt-get install --yes --no-install-recommends rsync git openssh-client curl sshpass
-    - eval $(ssh-agent -s)
-    - chmod 600 ${SSH_DEPLOY_KEY}
-    - ssh-add ${SSH_DEPLOY_KEY}
-    - mkdir -p ~/.ssh
-    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+  #    - apt-get update && apt-get install --yes --no-install-recommends rsync git openssh-client curl sshpass
+  #    - eval $(ssh-agent -s)
+  #    - chmod 600 ${SSH_DEPLOY_KEY}
+  #    - ssh-add ${SSH_DEPLOY_KEY}
+  #    - mkdir -p ~/.ssh
+  #    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
   script:
-    # deploy application and server configuration
+    - bash ${CI_PROJECT_DIR}/.more-ci/deploy-pre.sh ${SSH_DEPLOY_KEY}
     #    - "cat ${ENV_FILE} | ssh rockfic@${DEPLOY_SERVER} 'cat > ~/rockfic-staging/.env'"
-    - rsync --archive --delete ${CI_PROJECT_DIR}/ rockfic@${DEPLOY_SERVER}:~/rockfic-staging/
+    - rsync --archive --del ${CI_PROJECT_DIR}/ rockfic@${DEPLOY_SERVER}:~/rockfic-staging/
     - scp ${ENV_FILE} rockfic@${DEPLOY_SERVER}:rockfic-staging/.env
     #- rsync --archive --delete ${CI_PROJECT_DIR}/cnf/ ${DEPLOY_USER}@${DEPLOY_SERVER}:~/cnf/
 
     # restart Node.js and reload nginx configuration
     - sshpass -p "${OLDROOTPWD}" ssh root@rockfic.com '~/cp.sh'
-    - ssh rockfic@${DEPLOY_SERVER} "mongosh mongodb://localhost:27017 <(echo -e 'use rockfic_old\ndb.dropDatabase()\nuse ${DB_NAME}\ndb.dropDatabase()')"
-    - ssh rockfic@${DEPLOY_SERVER} mongosh mongodb://localhost:27017/${DB_NAME} --eval '"db.dropDatabase()"'
-    - ssh rockfic@${DEPLOY_SERVER} 'mongorestore --drop -d rockfic_old dump/rockfic'
-    - ssh rockfic@${DEPLOY_SERVER} 'cd migrator && bun install && NODE_ENV=production bun run ./index.ts'
-    - ssh rockfic@${DEPLOY_SERVER} 'sed -Ei "s,(hasMigrated = )false,\1true," rockfic-staging/lib/dbconfig.ts'
-    - ssh rockfic@${DEPLOY_SERVER} "kill `pidof node`"
+    - ssh rockfic@${DEPLOY_SERVER} "~/stage.sh"
     - ssh rockfic@${DEPLOY_SERVER} node "~/rockfic-staging/.output/server/index.mjs" \&\>/dev/null \& disown \%1
     - ssh rockfic@${DEPLOY_SERVER} sudo systemctl reload apache2
+  except:
+    - tags
+deploy_production:
+  stage: deploy
   environment:
-    name: staging
-    url: https://next.rockfic.com
-  # restrict to specific branch
+    name: production
+    url: https://www.rockfic.com
+  image: ubuntu:latest
+  script:
+    - bash ${CI_PROJECT_DIR}/.more-ci/deploy-pre.sh ${SSH_DEPLOY_KEY}
+    - rsync --archive --del ${CI_PROJECT_DIR}/ root@${DEPLOY_SERVER}:/home/@rockfic/
+    - scp ${ENV_FILE} root@${DEPLOY_SERVER}:/home/@rockfic/.env
+    #- rsync --archive --delete ${CI_PROJECT_DIR}/cnf/ ${DEPLOY_USER}@${DEPLOY_SERVER}:~/cnf/
+    - ssh root@${DEPLOY_SERVER} node "/home/@rockfic/.output/server/index.mjs" \&\>/dev/null \& disown \%1
+    - ssh rockfic@${DEPLOY_SERVER} sudo systemctl reload apache2
   only:
-    - master
+    - tags
+  # restrict to specific branch
diff --git a/.more-ci/deploy-pre.sh b/.more-ci/deploy-pre.sh
new file mode 100644
index 0000000..394435f
--- /dev/null
+++ b/.more-ci/deploy-pre.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+apt-get update && apt-get install --yes --no-install-recommends rsync git openssh-client curl sshpass
+eval $(ssh-agent -s)
+chmod 600 $1
+ssh-add $1
+mkdir -p ~/.ssh
+[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
\ No newline at end of file