diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index ef9e17435e..0000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,510 +0,0 @@
-version: 2.1
-
-orbs:
-  aws-cli: circleci/aws-cli@4.1.1
-  aws-ecs: circleci/aws-ecs@4.0.0
-  opsgenie: opsgenie/opsgenie@1.0.8
-
-
-jobs:
-  frontend-code-test:
-    resource_class: large
-    docker:
-      - image: cimg/node:22.13.0
-    working_directory: /home/circleci/tasking-manager
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - yarn-deps-{{ checksum "frontend/yarn.lock" }}
-      - run:
-          name: Install node dependencies
-          command: |
-            yarn --version
-            cd ${CIRCLE_WORKING_DIRECTORY}/frontend
-            yarn install
-      - save_cache:
-          key: yarn-deps-{{ checksum "frontend/yarn.lock" }}
-          paths:
-            - frontend/node_modules
-            - env
-      - run:
-          name: Run yarn test
-          no_output_timeout: 20m
-          command: |
-            cd ${CIRCLE_WORKING_DIRECTORY}/frontend/
-            CI=true yarn test -w 1 --silent
-            CI=true GENERATE_SOURCEMAP=false yarn build
-
-  backend-code-check-PEP8:
-    docker:
-      - image: cimg/python:3.10
-    steps:
-      - checkout
-      - run:
-          name: flake8 tests
-          command: |
-            pip install flake8
-            flake8 manage.py backend tests migrations
-
-  backend-code-check-Black:
-    docker:
-      - image: cimg/python:3.10
-    steps:
-      - checkout
-      - run:
-          name: black tests
-          command: |
-            pip install 'black==23.12.1' ## TODO: Update to version 24
-            black --check manage.py backend tests migrations
-
-  backend-functional-tests:
-    resource_class: large
-    docker:
-
-      - image: cimg/python:3.10
-        environment:
-          SQLALCHEMY_DATABASE_URI: postgresql://taskingmanager@localhost/test_tm
-          POSTGRES_TEST_DB: test_tm
-          POSTGRES_USER: taskingmanager
-          POSTGRES_ENDPOINT: localhost
-          TM_ORG_CODE: "CICode"
-          TM_ORG_NAME: "CircleCI Test Organisation"
-
-      - image: cimg/postgres:14.9-postgis
-        environment:
-          POSTGRES_USER: taskingmanager
-          POSTGRES_DB: test_tm
-
-    working_directory: /home/circleci/tasking_manager
-    steps:
-      - checkout
-      - run: sudo apt-get update
-      - run: sudo apt-get -y install libgeos-dev # Required for shapely
-      - run: sudo apt-get -y install proj-bin libproj-dev
-      - run: pip install --upgrade pip uv==0.7.2
-      - run: uv export --all-groups > requirements.txt
-      - run: pip install -r requirements.txt
-      - run: mkdir --mode 766 -p /tmp/logs
-      - run: mkdir ${CIRCLE_WORKING_DIRECTORY}/tests/backend/results
-      - run: find ./tests/backend -name "test*.py" -exec chmod -x {} \;
-      - run: echo "export TM_LOG_DIR=/tmp/logs" >> $BASH_ENV
-      - run: coverage erase
-      - run:
-          name: Run backend functional tests
-          command: |
-            coverage run --source ./backend -m pytest \
-              --rootdir ./tests/backend \
-              --junit-xml ${CIRCLE_WORKING_DIRECTORY}/tests/backend/results/unitresults.xml
-      - run: coverage xml -o ${CIRCLE_WORKING_DIRECTORY}/tests/backend/results/coverage.xml
-      - store_test_results:
-          path: tests/backend/results/unitresults.xml
-      - store_artifacts:
-          path: tests/backend/results
-
-  database-backup:
-    resource_class: large
-    parameters:
-      stack_name:
-        description: "Cloudformation stack name"
-        type: string
-    docker:
-      - image: cimg/postgres:15.4-postgis
-    steps:
-      - aws-cli/setup:
-          role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
-          profile_name: "OIDC-Profile"
-          role_session_name: "database-snapshot"
-          session_duration: "2700"
-      - run:
-          name: Find the instance ID of the database in the stack to backup
-          command: |
-            RDS_ID=$(aws rds describe-db-instances \
-              --query 'DBInstances[?contains(TagList[].Key, `aws:cloudformation:stack-name`) && contains(TagList[].Value, `tasking-manager-<< parameters.stack_name >>`)].[DBInstanceIdentifier]' \
-              --output text)
-            echo "export RDS_ID=$RDS_ID" >> $BASH_ENV
-            echo "RDS ID is: $RDS_ID"
-      - run:
-          name: Find Snapshot creation timestamp
-          command: |
-            # Given instance ID, find the timestamp of the latest snapshot
-            SNAPSHOT_TIMESTAMP=$(aws rds describe-db-snapshots \
-              --db-instance-identifier=${RDS_ID} \
-              --query="max_by(DBSnapshots, &SnapshotCreateTime).OriginalSnapshotCreateTime" \
-              --output text)
-      - run:
-          name: Make Database Backup
-          command: |
-            aws rds wait db-instance-available \
-                --db-instance-identifier ${RDS_ID}
-            # create new aws rds snapshot
-            printf -v time_now '%(%Y-%m-%d-%H-%M)T' -1
-            aws rds create-db-snapshot \
-                --db-snapshot-identifier tm4-<< parameters.stack_name >>-${RDS_ID}-${time_now} \
-                --db-instance-identifier ${RDS_ID}
-            aws rds wait db-snapshot-completed \
-                --db-snapshot-identifier tm4-<< parameters.stack_name >>-${RDS_ID}-${time_now} \
-                --db-instance-identifier ${RDS_ID}
-            if [[ $? -eq 255 ]]; then
-              echo "Production snapshot creation failed. Exiting with exit-code 125"
-              exit 125
-            fi
-      - run:
-          name: Check / validate backup
-          command: |
-            echo "TODO: BACKUP VALIDATION NOT IMPLEMENTED"
-
-  backend_deploy:
-    parameters:
-      stack_name:
-        description: "the name of the stack for cfn-config"
-        type: string
-      gitsha:
-        description: "The 40 char hash of the git commit"
-        type: string
-      host_ami:
-        description: "AMI of the host instance"
-        type: string
-      pg_version:
-        description: "Engine version of PostgreSQL database"
-        type: string
-        default: "11.19"
-      pg_param_group:
-        description: "Parameter group for RDS PostgreSQL server"
-        type: string
-        default: "tm3-logging-postgres11"
-      db_instance_type:
-        description: "RDS DB Instance class for the backend database"
-        type: string
-        default: "db.t3.xlarge"
-      backend_instance_type:
-        description: "Backend EC2 Instance type"
-        type: string
-        default: "c6a.large"
-    working_directory: /home/circleci/tasking-manager
-    resource_class: medium
-    docker:
-      - image: cimg/node:22.13.0
-    steps:
-      - checkout
-      - aws-cli/setup:
-          role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
-          profile_name: "OIDC-Profile"
-          role_session_name: "backend-deploy"
-          session_duration: "2700"
-      - run: sudo apt-get update
-      - run: sudo apt-get -y install libgeos-dev jq
-      - run: sudo yarn global add @mapbox/cfn-config @mapbox/cloudfriend
-      - run:
-          name: Download and patch Cloudformation parameter JSON file
-          command: |
-            tmpfile=$(mktemp)
-            aws s3 cp s3://hot-cfn-config/tasking-manager/tasking-manager-<< parameters.stack_name >>-${AWS_REGION}.cfn.json /tmp/tasking-manager.cfn.json
-            jq --compact-output \
-              --arg GITSHA "<< parameters.gitsha >>" \
-              --arg AMI "<< parameters.host_ami >>" \
-              --arg PGVERSION "<< parameters.pg_version >>" \
-              --arg DBTYPE "<< parameters.db_instance_type >>" \
-              --arg EC2TYPE "<< parameters.backend_instance_type >>" \
-              --arg DBPARAMG "<< parameters.pg_param_group >>" \
-              '.GitSha = $GITSHA | .TaskingManagerBackendAMI = $AMI | .DatabaseEngineVersion = $PGVERSION | .DatabaseInstanceType = $DBTYPE | .DatabaseParameterGroupName = $DBPARAMG | .TaskingManagerBackendInstanceType = $EC2TYPE' \
-              /tmp/tasking-manager.cfn.json > "$tmpfile" && mv "$tmpfile" $CIRCLE_WORKING_DIRECTORY/cfn-config-<< parameters.stack_name >>.json
-      - run:
-          name: Deploy to << parameters.stack_name >>
-          command: |
-            export NODE_PATH=/usr/local/share/.config/yarn/global/node_modules/
-            validate-template $CIRCLE_WORKING_DIRECTORY/scripts/aws/cloudformation/tasking-manager.template.js
-            export JSON_CONFIG="$(< $CIRCLE_WORKING_DIRECTORY/cfn-config-<< parameters.stack_name >>.json)"
-            cfn-config update << parameters.stack_name >> $CIRCLE_WORKING_DIRECTORY/scripts/aws/cloudformation/tasking-manager.template.js -f -c hot-cfn-config -t hot-cfn-config -r $AWS_REGION -p "$JSON_CONFIG"
-
-  backend_deploy_containers:
-    working_directory: /home/circleci/tasking-manager
-    docker:
-      - image: cimg/python:3.10.7
-    steps:
-      - checkout
-      - aws-cli/setup:
-          role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
-          profile_name: "OIDC-Profile"
-          role_session_name: "backend-deploy-containers"
-          session_duration: "2700"
-      - run: sudo apt-get update
-      - run: sudo apt-get -y install curl
-      - run: echo "Run AWS Fargate"
-
-  frontend_deploy:
-    working_directory: /home/circleci/tasking-manager
-    resource_class: large
-    docker:
-      - image: cimg/node:22.13.0
-    parameters:
-      stack_name:
-        description: "the name of the stack for cfn-config"
-        type: string
-    steps:
-      - checkout
-      - aws-cli/setup:
-          role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
-          profile_name: "OIDC-Profile"
-          role_session_name: "frontend-deploy"
-          session_duration: "1800"
-      - run:
-          name: Deploy Frontend to S3
-          command: |
-            cd ${CIRCLE_WORKING_DIRECTORY}/frontend/
-            export TM_ENVIRONMENT=<< parameters.stack_name >>
-            yarn
-            CI=true GENERATE_SOURCEMAP=true yarn build
-            aws s3 sync build/ s3://tasking-manager-<< parameters.stack_name >>-react-app --delete --cache-control max-age=31536000
-            aws s3 cp s3://tasking-manager-<< parameters.stack_name >>-react-app s3://tasking-manager-<< parameters.stack_name >>-react-app --recursive --exclude "*" --include "*.html" --metadata-directive REPLACE --cache-control no-cache --content-type text/html
-            export DISTRIBUTION_ID=`aws cloudformation list-exports --output=text --query "Exports[?Name=='tasking-manager-<< parameters.stack_name >>-cloudfront-id-${AWS_REGION}'].Value"`
-            aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID --paths "/*"
-
-workflows:
-  version: 2
-
-  production-all:
-    when:
-      and:
-        - equal: [ deployment/hot-tasking-manager, << pipeline.git.branch >> ]
-    jobs:
-      - database-backup:
-          name: Backup production database
-          stack_name: "tm4-production"
-          context:
-            - org-global
-            - tasking-manager-tm4-production
-      - frontend-code-test
-      - frontend_wait_for_approval:
-          type: approval
-          requires:
-            - frontend-code-test
-      - backend-functional-tests
-      - backend-code-check-PEP8
-      - backend-code-check-Black
-      - backend_wait_for_approval:
-          type: approval
-          requires:
-            - Backup production database
-            - backend-functional-tests
-            - backend-code-check-PEP8
-            - backend-code-check-Black
-      - backend_deploy:
-          name: Deploy backend production
-          gitsha: $CIRCLE_SHA1
-          stack_name: "tm4-production"
-          host_ami: "/aws/service/debian/release/11/20240813-1838/amd64"
-          backend_instance_type: c6a.large
-          pg_version: "13.10"
-          pg_param_group: "default.postgres13"
-          db_instance_type: "db.t4g.2xlarge"
-          requires:
-            - backend_wait_for_approval
-          context:
-            - org-global
-            - tasking-manager-tm4-production
-      - frontend_deploy:
-          name: Deploy frontend production
-          stack_name: "tm4-production"
-          requires:
-            - frontend_wait_for_approval
-          context:
-            - org-global
-            - tasking-manager-tm4-production
-
-  production-frontend-only:
-    when:
-      and:
-        - equal: [ deployment/hot-tasking-manager-frontend, << pipeline.git.branch >> ]
-    jobs:
-      - frontend-code-test
-      - frontend_wait_for_approval:
-          type: approval
-          requires:
-            - frontend-code-test
-      - frontend_deploy:
-          name: Deploy frontend production
-          stack_name: "tm4-production"
-          requires:
-            - frontend_wait_for_approval
-          context:
-            - org-global
-            - tasking-manager-tm4-production
-
-  production-backend-only:
-    when:
-      and:
-        - equal: [ deployment/hot-tasking-manager-backend, << pipeline.git.branch >> ]
-    jobs:
-      - database-backup:
-          name: Backup production database
-          stack_name: "tm4-production"
-          context:
-            - org-global
-            - tasking-manager-tm4-production
-      - backend-functional-tests
-      - backend-code-check-PEP8
-      - backend-code-check-Black
-      - backend_wait_for_approval:
-          type: approval
-          requires:
-            - Backup production database
-            - backend-functional-tests
-            - backend-code-check-PEP8
-            - backend-code-check-Black
-      - backend_deploy:
-          name: Deploy backend production
-          gitsha: $CIRCLE_SHA1
-          stack_name: "tm4-production"
-          host_ami: "/aws/service/debian/release/11/20240813-1838/amd64"
-          backend_instance_type: c6a.large
-          pg_version: "13.10"
-          pg_param_group: "default.postgres13"
-          db_instance_type: "db.t4g.2xlarge"
-          requires:
-            - backend_wait_for_approval
-          context:
-            - org-global
-            - tasking-manager-tm4-production
-
-  teachosm-all:
-    when:
-      and:
-        - equal: [ deployment/teachosm-tasking-manager, << pipeline.git.branch >> ]
-    jobs:
-      - database-backup:
-          name: Backup TeachOSM database
-          stack_name: "teachosm"
-          context:
-            - org-global
-            - tasking-manager-teachosm
-      - backend-functional-tests
-      - backend_deploy:
-          name: Deploy TeachOSM Backend
-          gitsha: $CIRCLECI_SHA1
-          stack_name: "teachosm"
-          host_ami: "/aws/service/debian/release/11/20240813-1838/amd64"
-          requires:
-            - backend-functional-tests
-          context: tasking-manager-teachosm
-      - frontend_deploy:
-          name: Deploy TeachOSM Frontend
-          stack_name: "teachosm"
-          requires:
-            - backend-functional-tests
-          context: tasking-manager-teachosm
-
-  staging-all:
-    when:
-      and:
-        - not:
-            matches:
-              pattern: "^deployment/.*"
-              value: << pipeline.git.branch >>
-        - equal: [ main, << pipeline.git.branch >> ]
-    jobs:
-      - database-backup:
-          name: Backup staging database
-          stack_name: "staging"
-          requires:
-            - backend-code-check-PEP8
-            - backend-code-check-Black
-            - backend-functional-tests
-          context:
-            - org-global
-            - tasking-manager-staging
-      - frontend-code-test
-      - backend-code-check-PEP8
-      - backend-code-check-Black
-      - backend-functional-tests
-      - backend_deploy:
-          name: Deploy staging backend
-          gitsha: $CIRCLE_SHA1
-          stack_name: "staging"
-          host_ami: "/aws/service/debian/release/11/20240813-1838/amd64"
-          pg_version: "14.8"
-          pg_param_group: "default.postgres14"
-          db_instance_type: "db.t4g.small"
-          backend_instance_type: "t3.medium"
-          requires:
-            - Backup staging database
-            - backend-code-check-PEP8
-            - backend-code-check-Black
-            - backend-functional-tests
-          context:
-            - org-global
-            - tasking-manager-staging
-      - frontend_deploy:
-          name: Deploy staging frontend
-          stack_name: "staging"
-          requires:
-            - frontend-code-test
-          context:
-            - org-global
-            - tasking-manager-staging
-
-  development-all:
-    when:
-      and:
-        - not:
-            matches:
-              pattern: "^deployment/.*"
-              value: << pipeline.git.branch >>
-        - or:
-          ## - equal: [ develop, << pipeline.git.branch >> ] # Disabled while we use dev setup for e2e testing
-          - equal: [ dev-switch-to-sandbox, << pipeline.git.branch >> ]
-    jobs:
-      - database-backup:
-          name: Backup development database
-          stack_name: "dev"
-          requires:
-            - backend-code-check-PEP8
-            - backend-code-check-Black
-            - backend-functional-tests
-          context:
-            - org-global
-            - tasking-manager-dev
-      - frontend-code-test
-      - backend-code-check-PEP8
-      - backend-code-check-Black
-      - backend-functional-tests
-      - backend_deploy:
-          name: Deploy development backend
-          gitsha: $CIRCLE_SHA1
-          stack_name: "dev"
-          host_ami: "/aws/service/debian/release/11/20240813-1838/amd64"
-          pg_version: "14.10"
-          pg_param_group: "default.postgres14"
-          db_instance_type: "db.t4g.small"
-          backend_instance_type: "t3.medium"
-          requires:
-            - Backup development database
-            - backend-code-check-PEP8
-            - backend-code-check-Black
-            - backend-functional-tests
-          context:
-            - org-global
-            - tasking-manager-dev
-      - frontend_deploy:
-          name: Deploy development frontend
-          stack_name: "dev"
-          requires:
-            - frontend-code-test
-          context:
-            - org-global
-            - tasking-manager-dev
-
-  build-only-all:
-    when:
-      not:
-        or: # don't run this workflow for deployment branches
-          - matches:
-              pattern: "^deployment/.*"
-              value: << pipeline.git.branch >>
-          - equal: [ develop, << pipeline.git.branch >> ]
-          - equal: [ main, << pipeline.git.branch >> ]
-    jobs:
-      - frontend-code-test
-      - backend-code-check-PEP8
-      - backend-code-check-Black
-      - backend-functional-tests
diff --git a/.circleci/rdsid.sh b/.circleci/rdsid.sh
deleted file mode 100755
index d707b33db8..0000000000
--- a/.circleci/rdsid.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-ARNS=$(aws rds describe-db-instances --query "DBInstances[].DBInstanceArn" --output text --region us-east-1)
-for line in $ARNS; do
-    TAGS=$(aws rds list-tags-for-resource --resource-name "$line" --query "TagList[]" --region us-east-1)
-    MATCHES=$(echo $TAGS | python -c "import sys, json; tags = json.loads('$1'); remote = {t['Key']: t['Value'] for t in json.load(sys.stdin)}; print('$line'.split(':')[-1]) if len({'$line' for k, v in tags.items() if k in remote and v == remote[k]}) > 0 else ''")
-    if [[ ! -z $MATCHES ]]; then
-        echo $MATCHES
-    fi
-done
diff --git a/.github/workflows/add-version-to-db.yml b/.github/workflows/add-version-to-db.yml
index cce67fc3bb..1526d023cd 100644
--- a/.github/workflows/add-version-to-db.yml
+++ b/.github/workflows/add-version-to-db.yml
@@ -6,6 +6,6 @@ jobs:
   add_release:
     runs-on: ubuntu-latest
     steps:
-    - name: Add release version to db
-      run: |
-        curl -X POST "https://tasking-manager-tm4-production-api.hotosm.org/api/v2/system/release/"
+      - name: Add release version to db
+        run: |
+          curl -X POST "https://tasking-manager-production-api.hotosm.org/api/v2/system/release/"
diff --git a/.github/workflows/backend-build-deploy.yml b/.github/workflows/backend-build-deploy.yml
index 6996b0b792..5b8d399ede 100644
--- a/.github/workflows/backend-build-deploy.yml
+++ b/.github/workflows/backend-build-deploy.yml
@@ -26,51 +26,11 @@ env:
 
 jobs:
   image-build-and-push:
-    name: Build Container Images
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    outputs:
-      image_tags: ${{ steps.meta.outputs.tags }}
-
-    steps:
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set container image metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=raw,value=${{ github.ref_name }}
-            type=raw,value=${{ github.sha }}
-
-      - name: Build and push container image
-        id: build-push-image
-        uses: docker/build-push-action@v5
-        with:
-          context: "{{defaultContext}}"
-          target: prod
-          platforms: linux/amd64,linux/arm64
-          file: scripts/docker/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: |
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-${{ github.ref_name }}
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-main
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-staging
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-develop
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-${{ github.ref_name }},mode=max
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1
+    with:
+      image_name: ghcr.io/${{ github.repository }}/backend
+      build_target: prod
+      dockerfile: scripts/docker/Dockerfile
 
   deploy-service:
     name: Deploy ${{ matrix.service }} to ECS
diff --git a/.github/workflows/backend-build.yml b/.github/workflows/backend-build.yml
deleted file mode 100644
index 981e339820..0000000000
--- a/.github/workflows/backend-build.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Build & publish TM backend container image
-
-on:
-  pull_request:
-    branches:
-      - main
-      - staging
-      - develop
-
-jobs:
-  backend-build:
-    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1
-    with:
-      image_name: ghcr.io/${{ github.repository }}/backend
-      build_target: prod
-      dockerfile: scripts/docker/Dockerfile
diff --git a/.github/workflows/pr_test_backend.yml b/.github/workflows/pr_test_backend.yml
new file mode 100644
index 0000000000..acd2b6efa0
--- /dev/null
+++ b/.github/workflows/pr_test_backend.yml
@@ -0,0 +1,54 @@
+name: 🧪 PR Test Backend
+
+on:
+  pull_request:
+    branches:
+      - main
+      - staging
+      - develop
+    paths:
+      - "backend/**"
+  workflow_dispatch:
+
+jobs:
+  code-check-PEP8:
+    name: Run PEP8 code style checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8
+          pip install black==25.1.0
+
+      - name: Run PEP8 checks
+        run: |
+          flake8 manage.py backend tests migrations
+          black --check manage.py backend tests migrations
+
+  pytest:
+    uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@3.2.0
+    with:
+      image_name: ghcr.io/${{ github.repository }}/backend
+      build_context: .
+      build_dockerfile: ./scripts/docker/Dockerfile
+      pre_command: |
+        cp example.env tasking-manager.env
+        docker compose up -d tm-db tm-backend tm-migration tm-cron-jobs traefik
+        docker compose exec tm-db bash -c "PGPASSWORD=tm psql -U tm -d tasking-manager <<EOF
+        CREATE DATABASE taskingmanagertest;
+        EOF"
+      compose_file: "docker-compose.yml"
+      compose_service: tm-backend
+      compose_command: pytest tests/api/unit/ -p no:warnings
+      cache_extra_imgs: |
+        "postgis/postgis:14-3.3"
+    secrets: inherit
diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/pr_test_frontend.yml
similarity index 86%
rename from .github/workflows/frontend-build.yml
rename to .github/workflows/pr_test_frontend.yml
index fa434d0e86..d4398349ae 100644
--- a/.github/workflows/frontend-build.yml
+++ b/.github/workflows/pr_test_frontend.yml
@@ -1,20 +1,14 @@
-name: Build & publish TM frontend static files
+name: 🧪 PR Test Frontend
 
 on:
-  push:
-    branches:
-      - deployment/hot-tasking-manager
-      - deployment/demo-tasking-manager
-      - deployment/container-tasking-manager
-
   pull_request:
     branches:
       - main
       - staging
       - develop
-      - deployment/hot-tasking-manager
-      - deployment/demo-tasking-manager
-      - deployment/container-tasking-manager
+    paths:
+      - "frontend/**"
+  workflow_dispatch:
 
 jobs:
   build:
@@ -62,6 +56,10 @@ jobs:
         working-directory: ./frontend
         run: yarn install
 
+      - name: Run Yarn test
+        working-directory: ./frontend
+        run: yarn test
+
       - name: Generate build
         working-directory: ./frontend
         run: |
diff --git a/backend/services/messaging/message_service.py b/backend/services/messaging/message_service.py
index 89060e617a..dad2365b5e 100644
--- a/backend/services/messaging/message_service.py
+++ b/backend/services/messaging/message_service.py
@@ -774,14 +774,29 @@ async def _parse_message_for_bulk_mentions(
             )
             usernames.extend([member["username"] for member in team_members])
 
+            organisation_managers_query = """
+                SELECT DISTINCT u.username
+                FROM projects p
+                JOIN organisation_managers om ON p.organisation_id = om.organisation_id
+                JOIN users u ON u.id = om.user_id
+                WHERE p.id = :project_id
+            """
+
+            organisation_managers = await db.fetch_all(
+                organisation_managers_query, values={"project_id": project_id}
+            )
+            if organisation_managers:
+                usernames.extend(
+                    [manager["username"] for manager in organisation_managers]
+                )
+
         # Add contributors if task_id is provided and contributors are mentioned
         if task_id and "contributors" in parsed:
             contributors = await Message.get_all_tasks_contributors(
                 project_id, task_id, db
             )
             usernames.extend(contributors)
-
-        return usernames
+        return list(set(usernames))
 
     @staticmethod
     async def _parse_message_for_username(
diff --git a/frontend/src/components/header/tests/index.test.js b/frontend/src/components/header/tests/index.test.js
index bd65d55190..71c049f9c2 100644
--- a/frontend/src/components/header/tests/index.test.js
+++ b/frontend/src/components/header/tests/index.test.js
@@ -134,7 +134,7 @@ describe('Right side action items', () => {
     expect(screen.getByLabelText('Sample avatar')).toBeInTheDocument();
   });
 
-  test("when the user isn't logged in", () => {
+  test("when the user isn't logged in", async () => {
     act(() => {
       store.dispatch({
         type: 'SET_USER_DETAILS',
@@ -142,8 +142,10 @@ describe('Right side action items', () => {
       });
     });
     setup();
-    expect(screen.getByRole('combobox')).toBeInTheDocument();
-    expect(screen.getByText('English')).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.getByRole('combobox')).toBeInTheDocument();
+      expect(screen.getByText('English')).toBeInTheDocument();
+    });
     expect(
       screen.getByRole('button', {
         name: /log in/i,
diff --git a/frontend/src/components/localeSelect.js b/frontend/src/components/localeSelect.js
index 5c716723a9..cd4ad153f1 100644
--- a/frontend/src/components/localeSelect.js
+++ b/frontend/src/components/localeSelect.js
@@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl';
 import Select from 'react-select';
 
 import messages from './messages';
-import { supportedLocales } from '../utils/internationalization';
+import { useFetch } from '../hooks/UseFetch';
 import { setLocale } from '../store/actions/userPreferences';
 
 function LocaleSelect({
@@ -13,22 +13,30 @@ function LocaleSelect({
   removeBorder = true,
   fullWidth = false,
 }) {
+  const [errorLanguages, loadingLanguages, languages] = useFetch('system/languages/');
+
+  const supportedLanguages =
+    !errorLanguages && !loadingLanguages ? languages.supportedLanguages : [];
+
   const onLocaleSelect = (arr) => {
-    setLocale(arr[0].value);
+    setLocale(arr[0].code);
   };
 
   const getActiveLanguageNames = () => {
     const locales = [userPreferences.locale, navigator.language, navigator.language.substr(0, 2)];
     let supportedLocaleNames = [];
     locales.forEach((locale) =>
-      supportedLocales
-        .filter((i) => i.value === locale)
+      supportedLanguages
+        .filter((i) => i.code === locale)
         .forEach((i) => supportedLocaleNames.push(i)),
     );
 
-    return supportedLocaleNames.length ? supportedLocaleNames[0].value : 'en';
+    return supportedLocaleNames.length ? supportedLocaleNames[0].code : 'en';
   };
 
+  // wait till supportedLanguages are fetched
+  if (!supportedLanguages.length) return <></>;
+
   return (
     <div className={`settings-width ml-auto ${className || ''}`}>
       <Select
@@ -37,7 +45,10 @@ function LocaleSelect({
           control: (baseStyles, state) => ({
             ...baseStyles,
             border: removeBorder ? 'none' : 'auto',
-            width: fullWidth ? '100%' : `${8 * state.getValue()[0].label.length + 60}px`,
+            width:
+              fullWidth || !supportedLanguages.length
+                ? '100%'
+                : `${8 * state.getValue()[0].language.length + 60}px`,
             marginLeft: 'auto',
           }),
           menu: (baseStyles) => ({
@@ -45,11 +56,11 @@ function LocaleSelect({
             zIndex: 6,
           }),
         }}
-        getOptionLabel={({ label }) => label}
+        getOptionLabel={({ language }) => language}
         onChange={(e) => onLocaleSelect([e])}
-        options={supportedLocales}
+        options={supportedLanguages}
         placeholder={<FormattedMessage {...messages.language} />}
-        value={supportedLocales.find((editor) => editor.value === getActiveLanguageNames())}
+        value={supportedLanguages.find((editor) => editor.code === getActiveLanguageNames())}
       />
     </div>
   );
diff --git a/frontend/src/components/projects/clearFilters.js b/frontend/src/components/projects/clearFilters.js
index 2104594b24..ea97545743 100644
--- a/frontend/src/components/projects/clearFilters.js
+++ b/frontend/src/components/projects/clearFilters.js
@@ -3,9 +3,9 @@ import { FormattedMessage } from 'react-intl';
 
 import messages from './messages';
 
-export default function ClearFilters({ url, className = '' }: Object) {
+export default function ClearFilters({ url, className = '', onClick }: Object) {
   return (
-    <Link to={url} className={`red link ph3 pv2 f6 ${className}`}>
+    <Link to={url} className={`red link ph3 pv2 f6 ${className}`} onClick={onClick}>
       <FormattedMessage {...messages.clearFilters} />
     </Link>
   );
diff --git a/frontend/src/components/projects/exploreProjectsTable.js b/frontend/src/components/projects/exploreProjectsTable.js
index a7e471d558..3affa66101 100644
--- a/frontend/src/components/projects/exploreProjectsTable.js
+++ b/frontend/src/components/projects/exploreProjectsTable.js
@@ -2,10 +2,8 @@ import { Link } from 'react-router-dom';
 import { useReactTable, getCoreRowModel, flexRender } from '@tanstack/react-table';
 import { FormattedMessage } from 'react-intl';
 import { formatDistance } from 'date-fns';
-import { Tooltip } from 'react-tooltip';
 import PropTypes from 'prop-types';
 
-import { ProgressBar } from '../progressBar';
 import { PriorityBox } from '../projectCard/priorityBox';
 import messages from './messages';
 import { CircleExclamationIcon } from '../svgIcons';
@@ -51,55 +49,22 @@ const COLUMNS = [
     ),
   },
   {
-    accessorKey: 'progress',
+    accessorKey: 'percentMapped',
+    minSize: 130,
     header: () => (
       <span>
-        <FormattedMessage {...messages.progressColumn} />
+        <FormattedMessage {...messages.percentMapped} />
+      </span>
+    ),
+  },
+  {
+    accessorKey: 'percentValidated',
+    minSize: 137,
+    header: () => (
+      <span>
+        <FormattedMessage {...messages.percentValidated} />
       </span>
     ),
-    minSize: 130,
-    cell: ({ row }) => {
-      const tooltipContent = (
-        <div>
-          <p className="lh-copy ma0 white f7 fw4">
-            <FormattedMessage
-              {...messages['percentMapped']}
-              values={{ n: <span className="fw8">{row.original.percentMapped}</span> }}
-            />
-          </p>
-          <p className="lh-copy ma0 white f7 fw4">
-            <FormattedMessage
-              {...messages['percentValidated']}
-              values={{ n: <span className="fw8">{row.original.percentValidated}</span> }}
-            />
-          </p>
-        </div>
-      );
-
-      return (
-        <div>
-          <div data-tooltip-id={`project-${row.original.projectId}-progress`}>
-            <ProgressBar
-              firstBarValue={
-                row.original.percentMapped > 0
-                  ? Math.max(8, row.original.percentMapped)
-                  : row.original.percentMapped
-              }
-              secondBarValue={
-                row.original.percentValidated > 0
-                  ? Math.max(8, row.original.percentValidated)
-                  : row.original.percentValidated
-              }
-              height="half"
-              small={false}
-            />
-          </div>
-          <Tooltip id={`project-${row.original.projectId}-progress`} className="z-3">
-            {tooltipContent}
-          </Tooltip>
-        </div>
-      );
-    },
   },
   {
     accessorKey: 'totalContributors',
diff --git a/frontend/src/components/projects/messages.js b/frontend/src/components/projects/messages.js
index 4cc0f78de3..e507035d4a 100644
--- a/frontend/src/components/projects/messages.js
+++ b/frontend/src/components/projects/messages.js
@@ -166,7 +166,7 @@ export default defineMessages({
   },
   allprojects: {
     id: 'project.nav.allprojects',
-    defaultMessage: 'All',
+    defaultMessage: 'All Projects',
   },
   active: {
     id: 'project.nav.active',
@@ -192,6 +192,10 @@ export default defineMessages({
     id: 'project.nav.archived',
     defaultMessage: 'Archived',
   },
+  published: {
+    id: 'project.nav.published',
+    defaultMessage: 'Published',
+  },
   paginationCount: {
     id: 'project.pagination.count',
     defaultMessage: 'Showing {number} of {total} projects',
@@ -314,11 +318,11 @@ export default defineMessages({
   },
   percentMapped: {
     id: 'project.table.percentMapped',
-    defaultMessage: '{n}% mapped',
+    defaultMessage: 'Percent mapped',
   },
   percentValidated: {
     id: 'project.table.percentValidated',
-    defaultMessage: '{n}% validated',
+    defaultMessage: 'Percent validated',
   },
   downloadAsCSV: {
     id: 'project.table.downloadAsCSV',
diff --git a/frontend/src/components/projects/projectNav.js b/frontend/src/components/projects/projectNav.js
index 4e2d921ac1..2684dbdfc3 100644
--- a/frontend/src/components/projects/projectNav.js
+++ b/frontend/src/components/projects/projectNav.js
@@ -12,6 +12,7 @@ import { ProjectSearchBox } from './projectSearchBox';
 import ClearFilters from './clearFilters';
 import { OrderBySelector } from './orderBy';
 import { ProjectsActionFilter } from './projectsActionFilter';
+import { ProjectsStatusFilter } from './projectsStatusFilter';
 import { SwitchToggle } from '../formInputs';
 import DownloadAsCSV from './downloadAsCSV';
 import { GripIcon, ListIcon, FilledNineCellsGridIcon, TableListIcon } from '../svgIcons';
@@ -151,6 +152,7 @@ const DifficultyDropdown = (props) => {
 };
 
 export const ProjectNav = ({ isExploreProjectsPage, children }) => {
+  const dispatch = useDispatch();
   const location = useLocation();
   const [fullProjectsQuery, setQuery] = useExploreProjectsQueryParams();
   const encodedParams = stringify(fullProjectsQuery)
@@ -194,6 +196,10 @@ export const ProjectNav = ({ isExploreProjectsPage, children }) => {
   if ((isExploreProjectsPage && isExploreProjectsTableView) || !isMapShown) {
     clearFiltersURL = './?omitMapResults=1';
   }
+  // fixes clear filter not persisting grid/list view issue
+  if (searchParams.view) {
+    clearFiltersURL = `${clearFiltersURL}&view=${searchParams.view}`;
+  }
 
   // onSelectedItemChange={(changes) => console.log(changes)}
   return (
@@ -205,7 +211,10 @@ export const ProjectNav = ({ isExploreProjectsPage, children }) => {
             <div className="mv2 dib">
               <DifficultyDropdown setQuery={setQuery} fullProjectsQuery={fullProjectsQuery} />
             </div>
+
             <ProjectsActionFilter setQuery={setQuery} fullProjectsQuery={fullProjectsQuery} />
+
+            <ProjectsStatusFilter setQuery={setQuery} fullProjectsQuery={fullProjectsQuery} />
             <Link
               to={filterRouteToggled}
               id="more-filter-id"
@@ -225,7 +234,20 @@ export const ProjectNav = ({ isExploreProjectsPage, children }) => {
               className="f6"
             />
             {!filterIsEmpty && (
-              <ClearFilters url={clearFiltersURL} className="mv2 mh1 fr dn dib-l" />
+              <ClearFilters
+                url={clearFiltersURL}
+                className="mv2 mh1 fr dn dib-l"
+                onClick={() => {
+                  dispatch({ type: 'SET_ACTION', action: 'any' });
+                  setQuery(
+                    {
+                      ...fullProjectsQuery,
+                      action: 'any',
+                    },
+                    'pushIn',
+                  );
+                }}
+              />
             )}
 
             <ProjectSearchBox
diff --git a/frontend/src/components/projects/projectsActionFilter.js b/frontend/src/components/projects/projectsActionFilter.js
index d6bd81536e..9d8caa2507 100644
--- a/frontend/src/components/projects/projectsActionFilter.js
+++ b/frontend/src/components/projects/projectsActionFilter.js
@@ -37,24 +37,22 @@ export const ProjectsActionFilter = ({ setQuery, fullProjectsQuery }) => {
             'pushIn',
           );
         }
-        // 'Archived' is a special case, as it is not a valid action
-        dispatch({ type: 'SET_ACTION', action: value === 'ARCHIVED' ? 'any' : value });
+        dispatch({ type: 'SET_ACTION', action: value });
         setQuery(
           {
             ...fullProjectsQuery,
             page: undefined,
-            status: value !== 'ARCHIVED' ? undefined : 'ARCHIVED',
+            action: value,
           },
           'pushIn',
         );
       }}
       // use the action query param, in case someone loads the page with /explore?action=*
-      value={fullProjectsQuery.status || fullProjectsQuery.action || action || 'any'}
+      value={fullProjectsQuery.action || action || 'any'}
       options={[
         { label: <FormattedMessage {...messages.projectsToMap} />, value: 'map' },
         { label: <FormattedMessage {...messages.projectsToValidate} />, value: 'validate' },
         { label: <FormattedMessage {...messages.anyProject} />, value: 'any' },
-        { label: <FormattedMessage {...messages.archived} />, value: 'ARCHIVED' },
       ]}
       display={'Action'}
       className={'ba b--tan bg-white mr3 f6 v-mid dn dib-ns pv2 br1 pl3 fw5 blue-dark'}
diff --git a/frontend/src/components/projects/projectsStatusFilter.js b/frontend/src/components/projects/projectsStatusFilter.js
new file mode 100644
index 0000000000..6db5cb424a
--- /dev/null
+++ b/frontend/src/components/projects/projectsStatusFilter.js
@@ -0,0 +1,59 @@
+import { useCallback } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { useSelector } from 'react-redux';
+
+import messages from './messages';
+import { Dropdown } from '../dropdown';
+
+const ALL_STATUSES = ['PUBLISHED', 'ARCHIVED', 'DRAFT'];
+const ALL = 'all';
+
+export const ProjectsStatusFilter = ({ setQuery, fullProjectsQuery }) => {
+  const userDetails = useSelector((state) => state.auth.userDetails);
+  const isOrgManager = useSelector(
+    (state) => state.auth.organisations && state.auth.organisations.length > 0,
+  );
+  // allow admin features for super admin as well as organisation manager
+  const isAdmin = (userDetails && userDetails.role === 'ADMIN') || isOrgManager;
+
+  const dropdownOptions = [
+    { label: <FormattedMessage {...messages.allprojects} />, value: ALL },
+    { label: <FormattedMessage {...messages.published} />, value: 'PUBLISHED' },
+    { label: <FormattedMessage {...messages.archived} />, value: 'ARCHIVED' },
+  ];
+
+  if (isAdmin) {
+    dropdownOptions.push({ label: <FormattedMessage {...messages.draft} />, value: 'DRAFT' });
+  }
+
+  const handleStatusChange = useCallback(
+    (selected) => {
+      const value = selected && selected[0] && selected[0].value;
+      // filter out `DRAFT` for non-admins
+      const status = isAdmin ? ALL_STATUSES : ALL_STATUSES.filter((stat) => stat !== 'DRAFT');
+      setQuery(
+        {
+          ...fullProjectsQuery,
+          page: undefined,
+          status: value === ALL ? status.join(',') : value,
+        },
+        'pushIn',
+      );
+    },
+    [fullProjectsQuery, setQuery, isAdmin],
+  );
+
+  const statuses = isAdmin ? ALL_STATUSES : ALL_STATUSES.filter((stat) => stat !== 'DRAFT');
+
+  return (
+    <Dropdown
+      onChange={handleStatusChange}
+      value={
+        fullProjectsQuery.status === statuses.join(',') ? ALL : fullProjectsQuery.status || 'any'
+      }
+      options={dropdownOptions}
+      display="Project Status"
+      className="ba b--tan bg-white mr3 f6 v-mid dn dib-ns pv2 br1 pl3 fw5 blue-dark"
+    />
+  );
+};
diff --git a/frontend/src/components/projects/tests/projectsActionFilter.test.js b/frontend/src/components/projects/tests/projectsActionFilter.test.js
index 383dd3d008..7ce71d262f 100644
--- a/frontend/src/components/projects/tests/projectsActionFilter.test.js
+++ b/frontend/src/components/projects/tests/projectsActionFilter.test.js
@@ -16,12 +16,10 @@ describe('ProjectsActionFilter', () => {
     expect(screen.queryByText('Any project')).toBeInTheDocument();
     expect(screen.queryByText('Projects to map')).not.toBeInTheDocument();
     expect(screen.queryByText('Projects to validate')).not.toBeInTheDocument();
-    expect(screen.queryByText('Archived')).not.toBeInTheDocument();
     // open dropdown
     await user.click(screen.queryByText('Any project'));
     expect(screen.queryByText('Projects to map')).toBeInTheDocument();
     expect(screen.queryByText('Projects to validate')).toBeInTheDocument();
-    expect(screen.queryByText('Archived')).toBeInTheDocument();
     // select Projects to validate
     await user.click(screen.queryByText('Projects to validate'));
     expect(store.getState()['preferences']['action']).toBe('validate');
@@ -33,10 +31,6 @@ describe('ProjectsActionFilter', () => {
     await user.click(screen.queryByText('Any project'));
     await user.click(screen.queryByText('Projects to map'));
     expect(store.getState()['preferences']['action']).toBe('map');
-    // select Projects to archived, action set to any for this special case
-    await user.click(screen.queryByText('Projects to map'));
-    await user.click(screen.queryByText(/archived/i));
-    expect(store.getState()['preferences']['action']).toBe('any');
   });
 
   it('initialize it with validate action set', async () => {
diff --git a/frontend/src/hooks/UseProjectsQueryAPI.js b/frontend/src/hooks/UseProjectsQueryAPI.js
index cf9d92385c..398dfb655e 100644
--- a/frontend/src/hooks/UseProjectsQueryAPI.js
+++ b/frontend/src/hooks/UseProjectsQueryAPI.js
@@ -43,6 +43,7 @@ const projectQueryAllSpecification = {
   partnershipFrom: StringParam,
   partnershipTo: StringParam,
   downloadAsCSV: BooleanParam,
+  view: StringParam,
 };
 
 /* This can be passed into project API or used independently */
diff --git a/frontend/src/index.js b/frontend/src/index.js
index 6f8255a64c..62c14c6d1f 100644
--- a/frontend/src/index.js
+++ b/frontend/src/index.js
@@ -26,7 +26,7 @@ if (SENTRY_FRONTEND_DSN) {
     tracesSampleRate: 0.1,
 
     // Session Replays integration
-    replaysSessionSampleRate: 1.0,
+    replaysSessionSampleRate: 0.1,
     // If the entire session is not sampled, use the below sample rate to sample
     // sessions when an error occurs.
     replaysOnErrorSampleRate: 1.0,
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 2425fa4323..63429fcdd1 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -624,7 +624,7 @@
   "project.nav.manageProjects": "Manage Projects",
   "project.nav.favorited": "Favorited",
   "project.nav.contributed": "Contributed",
-  "project.nav.allprojects": "All",
+  "project.nav.allprojects": "All Projects",
   "project.nav.active": "Active",
   "project.nav.stale": "Stale",
   "project.nav.managed": "Managed by me",
diff --git a/frontend/src/network/tests/mockData/header.js b/frontend/src/network/tests/mockData/header.js
new file mode 100644
index 0000000000..d467695f9d
--- /dev/null
+++ b/frontend/src/network/tests/mockData/header.js
@@ -0,0 +1,8 @@
+export const systemLanguages = {
+  supportedLanguages: [
+    {
+      code: 'en',
+      language: 'English',
+    },
+  ],
+};
diff --git a/frontend/src/network/tests/server-handlers.js b/frontend/src/network/tests/server-handlers.js
index 7abc498457..de56b2c7d7 100644
--- a/frontend/src/network/tests/server-handlers.js
+++ b/frontend/src/network/tests/server-handlers.js
@@ -71,6 +71,7 @@ import {
 import tasksGeojson from '../../utils/tests/snippets/tasksGeometry';
 import { API_URL, OHSOME_STATS_API_URL, defaultChangesetComment } from '../../config';
 import { notifications, ownCountUnread } from './mockData/notifications';
+import { systemLanguages } from './mockData/header';
 import { authLogin, setUser, userRegister } from './mockData/auth';
 import {
   extendTask,
@@ -153,6 +154,10 @@ const handlers = [
   rest.get(API_URL + 'projects/queries/:projectId/similar-projects/', async (req, res, ctx) => {
     return res(ctx.json(similarProjects));
   }),
+  // HEADER
+  rest.get(API_URL + 'system/languages/', async (req, res, ctx) => {
+    return res(ctx.json(systemLanguages));
+  }),
   // AUTHENTICATION
   rest.get(API_URL + 'system/authentication/login/', async (req, res, ctx) => {
     return res(ctx.json(authLogin));
diff --git a/frontend/src/utils/tests/openEditor.test.js b/frontend/src/utils/tests/openEditor.test.js
index e12fdf65bd..e5b8126a67 100644
--- a/frontend/src/utils/tests/openEditor.test.js
+++ b/frontend/src/utils/tests/openEditor.test.js
@@ -20,12 +20,14 @@ describe('test if getIdUrl', () => {
       imagery:
         'tms[1,22]:https://api.mapbox.com/styles/v1/tm4/code123/tiles/256/{zoom}/{x}/{y}?access_token=pk.123',
     };
-    expect(getIdUrl(testProject, [120.25684, -9.663953], 18, [1])).toBe(
+    const idUrl = getIdUrl(testProject, [120.25684, -9.663953], 18, [1]);
+    const decodedURI = decodeURIComponent(idUrl);
+    expect(decodedURI).toBe(
       'https://www.openstreetmap.org/edit?editor=id&' +
         '#map=18/-9.663953/120.25684' +
-        '&comment=%23hotosm-project-5522%20%23osm_in%20%232018IndiaFloods%20%23mmteamarm' +
-        '&background=custom:https%3A%2F%2Fapi.mapbox.com%2Fstyles%2Fv1%2Ftm4%2Fcode123%2Ftiles%2F256%2F%7Bz%7D%2F%7Bx%7D%2F%7By%7D%3Faccess_token%3Dpk.123' +
-        '&gpx=http%3A%2F%2F127.0.0.1%3A5000%2Fapi%2Fv2%2Fprojects%2F1234%2Ftasks%2Fqueries%2Fgpx%2F%3Ftasks%3D1',
+        '&comment=#hotosm-project-5522 #osm_in #2018IndiaFloods #mmteamarm' +
+        '&background=custom:https://api.mapbox.com/styles/v1/tm4/code123/tiles/256/{z}/{x}/{y}?access_token=pk.123' +
+        `&gpx=${API_URL}projects/1234/tasks/queries/gpx/?tasks=1`,
     );
   });
 
@@ -36,12 +38,20 @@ describe('test if getIdUrl', () => {
       imagery:
         'tms[1,22]:https://api.mapbox.com/styles/v1/tm4/code123/tiles/256/{zoom}/{x}/{y}?access_token=pk.123',
     };
-    expect(getIdUrl(testProject, [120.25684, -9.663953], 18, [1], 'https://mapwith.ai/rapid')).toBe(
+    const idUrl = getIdUrl(
+      testProject,
+      [120.25684, -9.663953],
+      18,
+      [1],
+      'https://mapwith.ai/rapid',
+    );
+    const decodedURI = decodeURIComponent(idUrl);
+    expect(decodedURI).toBe(
       'https://mapwith.ai/rapid?' +
         '#map=18/-9.663953/120.25684' +
-        '&comment=%23hotosm-project-5522%20%23osm_in%20%232018IndiaFloods%20%23mmteamarm' +
-        '&background=custom:https%3A%2F%2Fapi.mapbox.com%2Fstyles%2Fv1%2Ftm4%2Fcode123%2Ftiles%2F256%2F%7Bz%7D%2F%7Bx%7D%2F%7By%7D%3Faccess_token%3Dpk.123' +
-        '&gpx=http%3A%2F%2F127.0.0.1%3A5000%2Fapi%2Fv2%2Fprojects%2F1234%2Ftasks%2Fqueries%2Fgpx%2F%3Ftasks%3D1',
+        '&comment=#hotosm-project-5522 #osm_in #2018IndiaFloods #mmteamarm' +
+        '&background=custom:https://api.mapbox.com/styles/v1/tm4/code123/tiles/256/{z}/{x}/{y}?access_token=pk.123' +
+        `&gpx=${API_URL}projects/1234/tasks/queries/gpx/?tasks=1`,
     );
   });
 
@@ -51,12 +61,14 @@ describe('test if getIdUrl', () => {
       projectId: 1234,
       idPresets: ['building', 'highway', 'natural/water'],
     };
-    expect(getIdUrl(testProject, [120.25684, -9.663953], 18, [1])).toBe(
+    const idUrl = getIdUrl(testProject, [120.25684, -9.663953], 18, [1]);
+    const decodedURI = decodeURIComponent(idUrl);
+    expect(decodedURI).toBe(
       'https://www.openstreetmap.org/edit?editor=id&' +
         '#map=18/-9.663953/120.25684' +
-        '&comment=%23hotosm-project-5522%20%23osm_in%20%232018IndiaFloods%20%23mmteamarm' +
-        '&gpx=http%3A%2F%2F127.0.0.1%3A5000%2Fapi%2Fv2%2Fprojects%2F1234%2Ftasks%2Fqueries%2Fgpx%2F%3Ftasks%3D1' +
-        '&presets=building%2Chighway%2Cnatural%2Fwater',
+        '&comment=#hotosm-project-5522 #osm_in #2018IndiaFloods #mmteamarm' +
+        `&gpx=${API_URL}projects/1234/tasks/queries/gpx/?tasks=1` +
+        '&presets=building,highway,natural/water',
     );
   });
 
@@ -79,11 +91,13 @@ describe('test if getIdUrl', () => {
       changesetComment: '#hotosm-project-5522',
       projectId: 1234,
     };
-    expect(getIdUrl(testProject, [120.25684, -9.663953], 18, [1, 2])).toBe(
+    const idUrl = getIdUrl(testProject, [120.25684, -9.663953], 18, [1, 2]);
+    const decodedURI = decodeURIComponent(idUrl);
+    expect(decodedURI).toBe(
       'https://www.openstreetmap.org/edit?editor=id&' +
         '#map=18/-9.663953/120.25684' +
-        '&comment=%23hotosm-project-5522' +
-        '&gpx=http%3A%2F%2F127.0.0.1%3A5000%2Fapi%2Fv2%2Fprojects%2F1234%2Ftasks%2Fqueries%2Fgpx%2F%3Ftasks%3D1%2C2',
+        '&comment=#hotosm-project-5522' +
+        `&gpx=${API_URL}projects/1234/tasks/queries/gpx/?tasks=1,2`,
     );
   });
 
@@ -93,12 +107,14 @@ describe('test if getIdUrl', () => {
       projectId: 1234,
       imagery: 'Maxar-Premium',
     };
-    expect(getIdUrl(testProject, [120.25684, -9.663953], 18, [1, 2])).toBe(
+    const idUrl = getIdUrl(testProject, [120.25684, -9.663953], 18, [1, 2]);
+    const decodedURI = decodeURIComponent(idUrl);
+    expect(decodedURI).toBe(
       'https://www.openstreetmap.org/edit?editor=id&' +
         '#map=18/-9.663953/120.25684' +
-        '&comment=%23hotosm-project-5522' +
+        '&comment=#hotosm-project-5522' +
         '&background=Maxar-Premium' +
-        '&gpx=http%3A%2F%2F127.0.0.1%3A5000%2Fapi%2Fv2%2Fprojects%2F1234%2Ftasks%2Fqueries%2Fgpx%2F%3Ftasks%3D1%2C2',
+        `&gpx=${API_URL}projects/1234/tasks/queries/gpx/?tasks=1,2`,
     );
   });
 });