diff --git a/Dockerfile b/Dockerfile
index fde5213..65d02d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,26 +41,25 @@ RUN set -ex && \
     rm -rf /var/lib/apt
 COPY --from=builder /src/build/x86_64-linux-gnu/release/bin /usr/local/bin/
 
-# Create salvium user
-RUN adduser --system --group --disabled-password salvium && \
-	mkdir -p /wallet /home/salvium/.salvium && \
-	chown -R salvium:salvium /home/salvium/.salvium && \
-	chown -R salvium:salvium /wallet
+# Create peya user
+RUN adduser --system --group --disabled-password peya && \
+	mkdir -p /wallet /home/peya/.peya && \
+	chown -R peya:peya /home/peya/.peya && \
+	chown -R peya:peya /wallet
 
 # Contains the blockchain
-VOLUME /home/salvium/.salvium
+VOLUME /home/peya/.peya
 
 # Generate your wallet via accessing the container and run:
 # cd /wallet
-# salvium-wallet-cli
+# peya-wallet-cli
 VOLUME /wallet
 
-EXPOSE 19080
-EXPOSE 19081
+EXPOSE 17749
+EXPOSE 17750
 
-# switch to user salvium
-USER salvium
-
-ENTRYPOINT ["salviumd"]
-CMD ["--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=19080", "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=19081", "--non-interactive", "--confirm-external-bind"]
+# switch to user peya
+USER peya
 
+ENTRYPOINT ["peyad"]
+CMD ["--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=17749", "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=17750", "--non-interactive", "--confirm-external-bind"]
diff --git a/Dockerfile.salvium b/Dockerfile.salvium
index caf51a9..5c4560f 100644
--- a/Dockerfile.salvium
+++ b/Dockerfile.salvium
@@ -15,10 +15,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates curl zip libtool gperf automake autoconf \
  && rm -rf /var/lib/apt/lists/*
 
-# Clone the develop branch
-WORKDIR /opt
-RUN git clone --recursive -b develop https://github.com/salvium/salvium.git
-WORKDIR /opt/salvium
+# Build the checked-out Peya tree
+WORKDIR /opt/peya
+COPY . .
 
 # make the script runnable
 RUN chmod +x make_releases.sh
@@ -29,9 +28,9 @@ RUN mkdir ~/releases
 # Expose the releases directory for copying zip files to the host
 VOLUME ["~/releases"]
 
-ENTRYPOINT ["/opt/salvium/make_releases.sh"]
+ENTRYPOINT ["/opt/peya/make_releases.sh"]
 
 
 # To access the generated zip files on your host, run the container with:
 #   docker run -v ~/releases:/root/releases <image>
-# This will copy the zip files to your host's ~/salvium-releases directory.
+# This will copy the zip files to your host's ~/releases directory.
diff --git a/make_releases.sh b/make_releases.sh
index 36f5aa7..6b677a7 100755
--- a/make_releases.sh
+++ b/make_releases.sh
@@ -7,25 +7,25 @@ COMMIT=`git rev-parse --short=9 HEAD`
 # Build the 64-bit Windows release
 USE_DEVICE_TREZOR=OFF make depends target=x86_64-w64-mingw32 -j12
 pushd ./build/x86_64-w64-mingw32/release/bin > /dev/null
-zip -ur ~/releases/salvium-${TAG}-win64.zip salviumd.exe salvium-wallet-cli.exe salvium-wallet-rpc.exe
+zip -ur ~/releases/peya-${TAG}-win64.zip peyad.exe peya-wallet-cli.exe peya-wallet-rpc.exe
 popd > /dev/null
 
 # Build the 64-bit Apple Silicon release
 USE_DEVICE_TREZOR=OFF make depends target=aarch64-apple-darwin -j12
 pushd ./build/aarch64-apple-darwin/release/bin > /dev/null
-zip -ur ~/releases/salvium-${TAG}-macos-arm64.zip salviumd salvium-wallet-cli salvium-wallet-rpc
+zip -ur ~/releases/peya-${TAG}-macos-arm64.zip peyad peya-wallet-cli peya-wallet-rpc
 popd > /dev/null
 
 # Build the 64-bit MacOS Intel Silicon release
 USE_DEVICE_TREZOR=OFF make depends target=x86_64-apple-darwin -j12
 pushd ./build/x86_64-apple-darwin/release/bin > /dev/null
-zip -ur ~/releases/salvium-${TAG}-macos-x86_64.zip salviumd salvium-wallet-cli salvium-wallet-rpc
+zip -ur ~/releases/peya-${TAG}-macos-x86_64.zip peyad peya-wallet-cli peya-wallet-rpc
 popd > /dev/null
 
 # Build the 64-bit Linux release
 USE_DEVICE_TREZOR=OFF make depends target=x86_64-linux-gnu -j12
 pushd ./build/x86_64-linux-gnu/release/bin > /dev/null
-zip -ur ~/releases/salvium-${TAG}-linux-x86_64.zip salviumd salvium-wallet-cli salvium-wallet-rpc
+zip -ur ~/releases/peya-${TAG}-linux-x86_64.zip peyad peya-wallet-cli peya-wallet-rpc
 popd > /dev/null
 
 # Finish