diff --git a/devnet/alice.Dockerfile b/devnet/alice.Dockerfile
index 14df692379..f0a026a31b 100644
--- a/devnet/alice.Dockerfile
+++ b/devnet/alice.Dockerfile
@@ -3,8 +3,10 @@
 
 FROM golang:1.17
 
-# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot v0.9.10
-ARG CHAIN=3-auth-node-0.9.10
+ARG POLKADOT_VERSION=v0.9.10
+
+# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot $POLKADOT_VERSION
+ARG CHAIN=3-auth-node-${POLKADOT_VERSION}
 ARG DD_API_KEY=somekey
 
 ENV DD_API_KEY=${DD_API_KEY}
diff --git a/devnet/bob.Dockerfile b/devnet/bob.Dockerfile
index da81aea91a..973f25e5be 100644
--- a/devnet/bob.Dockerfile
+++ b/devnet/bob.Dockerfile
@@ -1,10 +1,13 @@
 # Copyright 2021 ChainSafe Systems (ON)
 # SPDX-License-Identifier: LGPL-3.0-only
 
+
 FROM golang:1.17
 
-# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot v0.9.10
-ARG CHAIN=3-auth-node-0.9.10
+ARG POLKADOT_VERSION=v0.9.10
+
+# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot $POLKADOT_VERSION
+ARG CHAIN=3-auth-node-${POLKADOT_VERSION}
 ARG DD_API_KEY=somekey
 
 ENV DD_API_KEY=${DD_API_KEY}
diff --git a/devnet/chain/3-auth-node-0.9.10/genesis-raw.json b/devnet/chain/3-auth-node-v0.9.10/genesis-raw.json
similarity index 99%
rename from devnet/chain/3-auth-node-0.9.10/genesis-raw.json
rename to devnet/chain/3-auth-node-v0.9.10/genesis-raw.json
index e34906f155..d72899e954 100644
--- a/devnet/chain/3-auth-node-0.9.10/genesis-raw.json
+++ b/devnet/chain/3-auth-node-v0.9.10/genesis-raw.json
@@ -154,4 +154,4 @@
       "childrenDefault": {}
     }
   }
-}
+}
\ No newline at end of file
diff --git a/devnet/chain/3-auth-node-0.9.10/genesis.json b/devnet/chain/3-auth-node-v0.9.10/genesis.json
similarity index 99%
rename from devnet/chain/3-auth-node-0.9.10/genesis.json
rename to devnet/chain/3-auth-node-v0.9.10/genesis.json
index 9e3384b868..1b1a283636 100644
--- a/devnet/chain/3-auth-node-0.9.10/genesis.json
+++ b/devnet/chain/3-auth-node-v0.9.10/genesis.json
@@ -194,4 +194,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/devnet/substrate_alice.Dockerfile b/devnet/substrate_alice.Dockerfile
index 08fea15946..da36228abe 100644
--- a/devnet/substrate_alice.Dockerfile
+++ b/devnet/substrate_alice.Dockerfile
@@ -1,6 +1,8 @@
 # Copyright 2022 ChainSafe Systems (ON)
 # SPDX-License-Identifier: LGPL-3.0-only
 
+ARG POLKADOT_VERSION=v0.9.10
+
 FROM golang:1.17 as openmetrics
 ARG METRICS_NAMESPACE=substrate.local.devnet
 
@@ -12,16 +14,19 @@ RUN go mod download
 COPY ./devnet .
 RUN go run cmd/update-dd-agent-confd/main.go -n=${METRICS_NAMESPACE} -t=key:alice > conf.yaml
 
-FROM parity/polkadot:v0.9.17
+FROM parity/polkadot:${POLKADOT_VERSION}
 
-# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot v0.9.10
-ARG CHAIN=3-auth-node-0.9.10
+ARG POLKADOT_VERSION
+# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot $POLKADOT_VERSION
+ARG CHAIN=3-auth-node-${POLKADOT_VERSION}
 ARG DD_API_KEY=somekey
 
 ENV DD_API_KEY=${DD_API_KEY}
 ENV CHAIN=${CHAIN}
 
 USER root
+RUN gpg --recv-keys --keyserver hkps://keys.mailvelope.com 9D4B2B6EB8F97156D19669A9FF0812D491B96798
+RUN gpg --export 9D4B2B6EB8F97156D19669A9FF0812D491B96798 > /usr/share/keyrings/parity.gpg
 RUN apt update && apt install -y curl && rm -r /var/cache/* /var/lib/apt/lists/*
 
 WORKDIR /cross-client
diff --git a/devnet/substrate_bob.Dockerfile b/devnet/substrate_bob.Dockerfile
index d820be1110..e9847f97ca 100644
--- a/devnet/substrate_bob.Dockerfile
+++ b/devnet/substrate_bob.Dockerfile
@@ -1,6 +1,6 @@
 # Copyright 2022 ChainSafe Systems (ON)
 # SPDX-License-Identifier: LGPL-3.0-only
-
+ARG POLKADOT_VERSION=v0.9.10
 FROM golang:1.17 as openmetrics
 
 ARG METRICS_NAMESPACE=substrate.local.devnet
@@ -13,18 +13,22 @@ RUN go mod download
 COPY ./devnet .
 RUN go run cmd/update-dd-agent-confd/main.go -n=${METRICS_NAMESPACE} -t=key:alice > conf.yaml
 
-FROM parity/polkadot:v0.9.17
+FROM parity/polkadot:${POLKADOT_VERSION}
 
-ARG key
-# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot v0.9.10
-ARG CHAIN=3-auth-node-0.9.10
+ARG POLKADOT_VERSION
+# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot $POLKADOT_VERSION
+ARG CHAIN=3-auth-node-${POLKADOT_VERSION}
 ARG DD_API_KEY=somekey
+ARG key
 
 ENV DD_API_KEY=${DD_API_KEY}
 ENV CHAIN=${CHAIN}
 ENV key=${key}
 
 USER root
+RUN gpg --recv-keys --keyserver hkps://keys.mailvelope.com 9D4B2B6EB8F97156D19669A9FF0812D491B96798
+RUN gpg --export 9D4B2B6EB8F97156D19669A9FF0812D491B96798 > /usr/share/keyrings/parity.gpg
+
 RUN apt update && apt install -y curl && rm -r /var/cache/* /var/lib/apt/lists/*
 
 WORKDIR /cross-client