diff --git a/.github/workflows/stepup-behat.yml b/.github/workflows/stepup-behat.yml
index 3d392f4..9a68c4f 100644
--- a/.github/workflows/stepup-behat.yml
+++ b/.github/workflows/stepup-behat.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     env:
-      DOCKER_COMPOSE: docker compose -f docker-compose.yml
+      DOCKER_COMPOSE: docker compose --profile smoketest -f docker-compose.yml
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/core/stop-dev-env.sh b/core/stop-dev-env.sh
new file mode 100755
index 0000000..57b7f8f
--- /dev/null
+++ b/core/stop-dev-env.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Use docker compose to start the environment but with the modified override file(s)
+echo -e "Starting the dev environment with the following command:\n"
+
+echo -e "docker compose --profile oidc -f docker-compose.yml down\n"
+docker compose --profile oidc -f docker-compose.yml down
diff --git a/stepup/docker-compose.yml b/stepup/docker-compose.yml
index c8fa584..3a2a65f 100644
--- a/stepup/docker-compose.yml
+++ b/stepup/docker-compose.yml
@@ -44,6 +44,8 @@ services:
     volumes:
       - ${PWD}/:/config
       - /var/run/docker.sock:/var/run/docker.sock
+    profiles:
+      - "smoketest"
 
   webauthn:
     image: ghcr.io/openconext/stepup-webauthn/stepup-webauthn:${STEPUP_VERSION:-prod}
diff --git a/stepup/start-dev-env.sh b/stepup/start-dev-env.sh
index f945d15..576ae2c 100755
--- a/stepup/start-dev-env.sh
+++ b/stepup/start-dev-env.sh
@@ -77,7 +77,5 @@ done
 # Use docker compose to start the environment but with the modified override file(s)
 echo -e "Starting the ${MODE} environment with the following command:\n"
 
-echo -e "docker compose -f docker-compose.yml ${docker_compose_args[@]} ${extra_compose_args} up ${d_option} ${@:$number_of_dev_envs}\n"
-docker compose -f docker-compose.yml ${docker_compose_args[@]} ${extra_compose_args} up ${d_option} ${@:$number_of_dev_envs}
-
-
+echo -e "docker compose --profile smoketest -f docker-compose.yml ${docker_compose_args[@]} ${extra_compose_args} up ${d_option} ${@:$number_of_dev_envs}\n"
+docker compose --profile smoketest -f docker-compose.yml ${docker_compose_args[@]} ${extra_compose_args} up ${d_option} ${@:$number_of_dev_envs}
diff --git a/stepup/stop-dev-env.sh b/stepup/stop-dev-env.sh
new file mode 100755
index 0000000..9f9326a
--- /dev/null
+++ b/stepup/stop-dev-env.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Use docker compose to start the environment but with the modified override file(s)
+echo -e "Starting the dev environment with the following command:\n"
+
+echo -e "docker compose --profile smoketest -f docker-compose.yml down\n"
+docker compose --profile smoketest -f docker-compose.yml down