diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 10c087381..000000000
--- a/.drone.yml
+++ /dev/null
@@ -1,182 +0,0 @@
----
-kind: pipeline
-name: default
-type: docker
-
-steps:
-  # Restore cache of downloaded dependencies
-  - name: restore-cache
-    image: drillster/drone-volume-cache
-    settings:
-      restore: true
-      mount:
-        - .sbt
-        - .ivy2
-        - ui/node_modules
-        - ui/bower_components
-    volumes: [{name: cache, path: /cache}]
-
-  # Run project tests
-  - name: run-tests
-    image: thehiveproject/drone-scala-node
-    commands:
-      - |
-        . ~/.nvm/nvm.sh
-        nvm install 12.18
-        npm install -g bower
-        sbt -Duser.home=$PWD test:compile test Universal/packageBin
-
-  # Build packages
-  - name: build-packages
-    image: thehiveproject/drone-scala-node
-    settings:
-      pgp_key: {from_secret: pgp_key}
-    commands:
-      - |
-        V=$(sbt -no-colors --error "print cortex/version" | tail -1)
-        if ( echo $V | grep -qi snapshot)
-        then
-          exit 1
-        fi
-        . ~/.nvm/nvm.sh
-        nvm install 12.18
-        npm install -g bower
-        [ -n "$PLUGIN_PGP_KEY" ] && gpg --batch --import - <<< $PLUGIN_PGP_KEY
-        sbt -Duser.home=$PWD Docker/stage Debian/packageBin Rpm/packageBin Universal/packageBin cortexWithDeps/Docker/stage
-        if ( echo $V | grep -qi rc )
-        then
-          echo $( echo $V | sed -re 's/([0-9]+.[0-9]+.[0-9]+)-RC([0-9]+)-([0-9]+)/\1-RC\2,\1-RC\2-\3/' ) > .tags
-        else
-          echo $( echo $V | sed -re 's/([0-9]+).([0-9]+).([0-9]+)-([0-9]+)/\1,\1.\2,\1.\2.\3,\1.\2.\3-\4,latest/' ) > .tags
-        fi
-        echo $V > cortex-version.txt
-        mv target/rpm/RPMS/noarch/cortex*.rpm target/
-        mv target/universal/cortex*.zip target/
-    when:
-      event: [tag]
-
-  # Save external libraries in cache
-  - name: save-cache
-    image: drillster/drone-volume-cache
-    settings:
-      rebuild: true
-      backend: "filesystem"
-      mount:
-        - .sbt
-        - .ivy2
-        - .cache
-        - ui/node_modules
-        - ui/bower_components
-    volumes: [{name: cache, path: /cache}]
-
-  # Send packages using scp
-  - name: send packages
-    image: appleboy/drone-scp
-    settings:
-      host: {from_secret: package_host}
-      username: {from_secret: package_user}
-      key: {from_secret: package_key}
-      target: {from_secret: incoming_path}
-      source:
-        - target/cortex*.deb
-        - target/cortex*.rpm
-        - target/cortex*.zip
-      strip_components: 1
-    when:
-      event: [tag]
-
-  # Publish packages
-  - name: publish packages
-    image: appleboy/drone-ssh
-    settings:
-      host: {from_secret: package_host}
-      user: {from_secret: package_user}
-      key: {from_secret: package_key}
-      publish_script: {from_secret: publish_script}
-    commands:
-      - PLUGIN_SCRIPT="bash $PLUGIN_PUBLISH_SCRIPT cortex $(cat cortex-version.txt)" /bin/drone-ssh
-    when:
-      event: [tag]
-
-  # Publish docker image on Docker Hub
-  - name: docker
-    image: plugins/docker
-    settings:
-      context: target/docker/stage
-      dockerfile: target/docker/stage/Dockerfile
-      repo: thehiveproject/cortex
-      username: {from_secret: docker_username}
-      password: {from_secret: docker_password}
-    when:
-      event: [tag]
-
-  # Publish docker image on Harbor
-  - name: harbor
-    image: plugins/docker
-    settings:
-      context: target/docker/stage
-      dockerfile: target/docker/stage/Dockerfile
-      registry: {from_secret: harbor_registry}
-      repo: {from_secret: harbor_repo}
-      username: {from_secret: harbor_username}
-      password: {from_secret: harbor_password}
-    when:
-      event: [tag]
-
-  - name: update docker tags
-    image: thehiveproject/drone-scala-node
-    commands:
-      - sed -i -e 's/,/-withdeps,/g; s/$/-withdeps/' .tags
-    when:
-      event: [tag]
-
-  # Publish docker image on Docker Hub
-  - name: docker fat
-    image: plugins/docker
-    settings:
-      context: target/docker-withdeps/target/docker/stage
-      dockerfile: target/docker-withdeps/target/docker/stage/Dockerfile
-      repo: thehiveproject/cortex
-      username: {from_secret: docker_username}
-      password: {from_secret: docker_password}
-    when:
-      event: [tag]
-
-  # Publish docker image on Harbor
-  - name: harbor fat
-    image: plugins/docker
-    settings:
-      context: target/docker-withdeps/target/docker/stage
-      dockerfile: target/docker-withdeps/target/docker/stage/Dockerfile
-      registry: {from_secret: harbor_registry}
-      repo: {from_secret: harbor_repo}
-      username: {from_secret: harbor_username}
-      password: {from_secret: harbor_password}
-    when:
-      event: [tag]
-
-  - name: send message
-    image: thehiveproject/drone_keybase
-    settings:
-      username: {from_secret: keybase_username}
-      paperkey: {from_secret: keybase_paperkey}
-      channel: {from_secret: keybase_channel}
-    commands:
-      - |
-        keybase oneshot -u "$PLUGIN_USERNAME" --paperkey "$PLUGIN_PAPERKEY"
-        URL="$DRONE_SYSTEM_PROTO://$DRONE_SYSTEM_HOST/$DRONE_REPO/$DRONE_BUILD_NUMBER"
-        if [ $DRONE_BUILD_STATUS = "success" ]
-        then
-          keybase chat send "$PLUGIN_CHANNEL" ":white_check_mark: $DRONE_REPO: build succeeded $URL"
-        else
-          keybase chat send "$PLUGIN_CHANNEL" ":x: $DRONE_REPO: build failed $URL"
-        fi
-    when:
-      status:
-      - success
-      - failure
-
-volumes:
-  - name: cache
-    host:
-      path: /opt/drone/cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a787de77b..263426f26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [3.1.8](https://github.com/TheHive-Project/Cortex/milestone/35) (2023-09-21)
+
+**Pull requests:**
+
+- Fixed user parameter name in application config sample [\#315](https://github.com/TheHive-Project/Cortex/pull/315)
+- Update cortex.service [\#361](https://github.com/TheHive-Project/Cortex/pull/361)
+- GroupUserMapper.scala: Backport fix from TheHive for group mapper functionality [\#438](https://github.com/TheHive-Project/Cortex/pull/438)
+- [CTX-16] fix: don't use Elasticsearch scroll to find user by its API key [\#447](https://github.com/TheHive-Project/Cortex/pull/447)
+- [CTX-17] fix: Update version of JFFI [\#448](https://github.com/TheHive-Project/Cortex/pull/448)
+- Update deps [\#449](https://github.com/TheHive-Project/Cortex/pull/449)
+
 ## [3.1.7](https://github.com/TheHive-Project/Cortex/milestone/34) (2022-10-07)
 
 **Implemented enhancements:**
diff --git a/version.sbt b/version.sbt
index 72cb9276a..6a635e516 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "3.1.7-1"
+ThisBuild / version := "3.1.8-1"
diff --git a/www/package.json b/www/package.json
index c5f90d233..34da96b82 100755
--- a/www/package.json
+++ b/www/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cortex",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "A powerfull observable analysis engine",
   "license": "AGPL-3.0-or-later",
   "homepage": "https://github.com/TheHive-Project/Cortex",