diff --git a/Makefile b/Makefile
index de7782a5..83182cca 100644
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ machine: _privatenet
 
 .PHONY: firewall
 firewall: _ips _privatenet
-	docker-compose run metalctl firewall create --description fw --name fw --hostname fw --project 00000000-0000-0000-0000-000000000000 --partition vagrant --image firewall-ubuntu-2.0 --size v1-small-x86 --networks internet-vagrant-lab,$(shell docker-compose run metalctl network list --name user-private-network -o template --template '{{ .id }}') --id=e0ab02d2-27cd-5a5e-8efc-080ba80cf258
+	docker-compose run metalctl firewall create --description fw --name fw --hostname fw --project 00000000-0000-0000-0000-000000000000 --partition vagrant --image firewall-ubuntu-2.0 --size v1-small-x86 --networks internet-vagrant-lab,$(shell docker-compose run metalctl network list --name user-private-network -o template --template '{{ .id }}')
 
 .PHONY: reinstall-machine01
 reinstall-machine01: env
diff --git a/README.md b/README.md
index c40a6b7d..d1f6a712 100644
--- a/README.md
+++ b/README.md
@@ -103,8 +103,8 @@ e0ab02d2-27cd-5a5e-8efc-080ba80cf258        Waiting      8s
 Create a machine/firewall with
 
 ```bash
-make machine
 make firewall
+make machine
 ```
 
 __Alternatively__ you may want to issue the `metalctl` commands by your own:
diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml
index 990f1b65..c3d2a36a 100644
--- a/inventories/group_vars/all/images.yaml
+++ b/inventories/group_vars/all/images.yaml
@@ -1,3 +1,2 @@
 ---
-# TODO: pin to fixed version before next release
-metal_stack_release_version: develop
+metal_stack_release_version: v0.6.3
diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml
index 0bf9005c..8e2c2150 100644
--- a/inventories/group_vars/control-plane/metal.yml
+++ b/inventories/group_vars/control-plane/metal.yml
@@ -12,16 +12,16 @@ metal_api_admin_key: metal-admin
 metal_api_nsq_tcp_address: nsqd:4150
 
 metal_api_images:
-- id: firewall-ubuntu-2.0.20201126
-  name: Firewall 2 Ubuntu 20201126
-  description: Firewall 2 Ubuntu 20201126
-  url: https://images.metal-stack.io/metal-os/master/firewall/2.0-ubuntu/20201126/img.tar.lz4
+- id: firewall-ubuntu-2.0.20210316
+  name: Firewall 2 Ubuntu 20210316
+  description: Firewall 2 Ubuntu 20210316
+  url: https://images.metal-stack.io/metal-os/master/firewall/2.0-ubuntu/20210316/img.tar.lz4
   features:
     - firewall
-- id: ubuntu-20.04.20201126
-  name: Ubuntu 20.04 20201126
-  description: Ubuntu 20.04 20201126
-  url: https://images.metal-stack.io/metal-os/master/ubuntu/20.04/20201126/img.tar.lz4
+- id: ubuntu-20.04.20210316
+  name: Ubuntu 20.04 20210316
+  description: Ubuntu 20.04 20210316
+  url: https://images.metal-stack.io/metal-os/master/ubuntu/20.04/20210316/img.tar.lz4
   features:
     - machine
 - id: ubuntu-cloud-init-20.04
diff --git a/test/integration.sh b/test/integration.sh
index 6b3ddadc..eacc7478 100755
--- a/test/integration.sh
+++ b/test/integration.sh
@@ -21,9 +21,9 @@ do
 done
 echo "$waiting/$minWaiting machines are waiting"
 
-echo "Create machine and firewall"
-make machine
+echo "Create firewall and machine"
 make firewall
+make machine
 
 echo "Waiting for machines to get to Phoned Home state"
 phoned=$(docker-compose run metalctl machine ls | grep Phoned | wc -l)
@@ -51,7 +51,7 @@ echo "Adding iptables forwarding rules for libvirt networking"
 make fwrules
 
 echo "Check if SSH login to firewall works"
-# FIXME: Again this is unstable in CI integration tests 
+# FIXME: Again this is unstable in CI integration tests
 # ssh -o StrictHostKeyChecking=no metal@100.255.254.1 -C exit
 
 echo "Successfully started mini-lab"