diff --git a/containers/drone-runner/tasks.yml b/containers/drone-runner/tasks.yml
index 697153f..d86b3da 100644
--- a/containers/drone-runner/tasks.yml
+++ b/containers/drone-runner/tasks.yml
@@ -60,12 +60,12 @@
           io.containers.autoupdate: "registry"
           traefik.enable: "true"
           traefik.http.routers.drone-runner.entrypoints: "https"
-          traefik.http.routers.drone-runner.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/runner/`) || Path(`/runner`))"
+          traefik.http.routers.drone-runner.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/ci-runner/`) || Path(`/ci-runner`))"
           traefik.http.routers.drone-runner.tls: "true"
           traefik.http.routers.drone-runner.tls.certresolver: "wildcard"
           traefik.http.routers.drone-runner.service: "drone-runner"
           traefik.http.routers.drone-runner.middlewares: "force-trailing-slash@file,drone-runner-prefixstrip@docker"
-          traefik.http.middlewares.drone-runner-prefixstrip.stripprefix.prefixes: "/runner"
+          traefik.http.middlewares.drone-runner-prefixstrip.stripprefix.prefixes: "/ci-runner"
           traefik.http.services.drone-runner.loadbalancer.server.port: "3000"
           traefik.docker.network: "traefik-drone-runner"
         env:
diff --git a/containers/drone-server/tasks.yml b/containers/drone-server/tasks.yml
index 2886b00..af46c94 100644
--- a/containers/drone-server/tasks.yml
+++ b/containers/drone-server/tasks.yml
@@ -58,12 +58,12 @@
           io.containers.autoupdate: "registry"
           traefik.enable: "true"
           traefik.http.routers.drone-server.entrypoints: "https"
-          traefik.http.routers.drone-server.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/drone/`) || Path(`/drone`))"
+          traefik.http.routers.drone-server.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/ci/`) || Path(`/ci`))"
           traefik.http.routers.drone-server.tls: "true"
           traefik.http.routers.drone-server.tls.certresolver: "wildcard"
           traefik.http.routers.drone-server.service: "drone-server"
-          traefik.http.routers.drone-server.middlewares: "force-trailing-slash@file,drone-server-prefixstrip@docker"
-          traefik.http.middlewares.drone-server-prefixstrip.stripprefix.prefixes: "/drone"
+          traefik.http.routers.drone-server.middlewares: "drone-server-prefixstrip@docker"
+          traefik.http.middlewares.drone-server-prefixstrip.stripprefix.prefixes: "/ci"
           traefik.http.services.drone-server.loadbalancer.server.port: "80"
           traefik.docker.network: "traefik-drone"
         env:
@@ -73,7 +73,7 @@
           DRONE_GITEA_SERVER: "https://{{ inventory_hostname }}/git"
           DRONE_GIT_ALWAYS_AUTH: "false"
           DRONE_RPC_SECRET: "{{ vault_drone_rpc_secret }}"
-          DRONE_SERVER_HOST: "{{ inventory_hostname }}/drone"
+          DRONE_SERVER_HOST: "{{ inventory_hostname }}/ci"
           DRONE_SERVER_PROTO: "https"
           DRONE_AGENTS_ENABLED: "true"
           DRONE_LOGS_TEXT: "true"