diff --git a/Cargo.lock b/Cargo.lock
index 8411d13..c85db1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 3
 [[package]]
 name = "admin-app"
 version = "0.1.0"
-source = "git+https://github.com/Nitrokey/admin-app.git?branch=apdu-app#21ddbf12a3a5f60916c4a47e1bf3e49ce5cf03cd"
+source = "git+https://github.com/Nitrokey/admin-app.git?tag=v0.1.0-nitrokey.16#21ddbf12a3a5f60916c4a47e1bf3e49ce5cf03cd"
 dependencies = [
  "apdu-app",
  "cbor-smol",
@@ -574,7 +574,7 @@ dependencies = [
 [[package]]
 name = "fido-authenticator"
 version = "0.1.1"
-source = "git+https://github.com/Nitrokey/fido-authenticator.git?branch=apdu-app#629a75f189a3db930070fb19753a9d347afea38d"
+source = "git+https://github.com/Nitrokey/fido-authenticator.git?tag=v0.1.1-nitrokey.21#629a75f189a3db930070fb19753a9d347afea38d"
 dependencies = [
  "apdu-app",
  "cbor-smol",
diff --git a/Cargo.toml b/Cargo.toml
index cbabd8e..1604087 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,11 +100,8 @@ ctaphid-dispatch = { git = "https://github.com/Nitrokey/ctaphid-dispatch", tag =
 #apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch.git", branch="sz-multiple-apps" }
 
 # forked
-# admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.11" }
-admin-app = { git = "https://github.com/Nitrokey/admin-app.git", branch = "apdu-app" }
-# fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.18" }
-fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", branch = "apdu-app" }
-# cbor-smol = { git = "https://github.com/Nitrokey/cbor-smol.git", tag = "v0.4.0-nitrokey.4"}
+admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.16" }
+fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.21" }
 cbor-smol = { git = "https://github.com/trussed-dev/cbor-smol.git", rev = "d499e527f1214b2998b844720f0d41a9d05be7e1" }
 
 # unreleased upstream changes