diff --git a/common/pipework b/common/pipework
index 97ce66b5..1381aa98 100755
--- a/common/pipework
+++ b/common/pipework
@@ -423,7 +423,7 @@ else
 	# use a locally installed client.
 	case "$DHCP_CLIENT" in
 	  dhcp)
-	    docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \
+	    docker run --rm -d --net container:$GUESTNAME --cap-add NET_ADMIN \
 	           busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \
 	           $DHCP_OPTIONS \
 	           >/dev/null
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 3faf6a91..5571dd17 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -326,6 +326,7 @@ kernel_test_prepare() {
 		"$CACHE_DIR/kernel-test/initrd-project-script.sh"
 
 	docker run \
+		--rm \
 		--cap-add=NET_ADMIN \
 		$(docker_kvm_param) \
 		--device /dev/net/tun:/dev/net/tun \
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index 6dbc6f1c..34aa740c 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -25,6 +25,7 @@ mkdir $VOL_BASE_DIR/unix
 
 echo Starting container with FRNET
 docker run	\
+		--rm \
 		--cap-add=NET_RAW --cap-add=SYS_RAWIO \
 		$(docker_network_params $SUBNET 10) \
 		--ulimit core=-1 \
@@ -44,6 +45,7 @@ done
 
 echo Starting container with FR testsuite
 docker run	\
+		--rm \
 		--cap-add=NET_RAW --cap-add=SYS_RAWIO \
 		$(docker_network_params $SUBNET 103) \
 		--ulimit core=-1 \
diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh
index 53da74d3..c8968ad6 100755
--- a/ttcn3-ggsn-test/jenkins.sh
+++ b/ttcn3-ggsn-test/jenkins.sh
@@ -55,10 +55,10 @@ else
 		"
 	OSMO_SUT_HOST="172.18.$SUBNET.201"
 fi
-docker run	--cap-add=NET_ADMIN \
+docker run	--rm \
+		--cap-add=NET_ADMIN \
 		--device /dev/net/tun:/dev/net/tun \
 		--sysctl net.ipv6.conf.all.disable_ipv6=0 \
-		--rm \
 		--ulimit core=-1 \
 		-v $VOL_BASE_DIR/ggsn:/data \
 		--name ${BUILD_TAG}-ggsn -d \