diff --git a/rpms/victoriametrics/resources/build.sh b/rpms/victoriametrics/resources/build.sh
deleted file mode 100755
index 0386f7b..0000000
--- a/rpms/victoriametrics/resources/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/bash
-nfpm pkg --config /app/resources/vminsert.yaml --target /app/dist --packager rpm
-nfpm pkg --config /app/resources/vmselect.yaml --target /app/dist --packager rpm
-nfpm pkg --config /app/resources/vmstorage.yaml --target /app/dist --packager rpm
diff --git a/rpms/victoriametrics/1.119.0/release b/rpms/vminsert/1.119.0/release
similarity index 100%
rename from rpms/victoriametrics/1.119.0/release
rename to rpms/vminsert/1.119.0/release
diff --git a/rpms/victoriametrics/Dockerfile b/rpms/vminsert/Dockerfile
similarity index 100%
rename from rpms/victoriametrics/Dockerfile
rename to rpms/vminsert/Dockerfile
diff --git a/rpms/vminsert/resources/build.sh b/rpms/vminsert/resources/build.sh
new file mode 100755
index 0000000..ae730e3
--- /dev/null
+++ b/rpms/vminsert/resources/build.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
diff --git a/rpms/victoriametrics/resources/vminsert.yaml b/rpms/vminsert/resources/nfpm.yaml
similarity index 100%
rename from rpms/victoriametrics/resources/vminsert.yaml
rename to rpms/vminsert/resources/nfpm.yaml
diff --git a/rpms/vmselect/1.119.0/release b/rpms/vmselect/1.119.0/release
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/rpms/vmselect/1.119.0/release
@@ -0,0 +1 @@
+1
diff --git a/rpms/vmselect/Dockerfile b/rpms/vmselect/Dockerfile
new file mode 100644
index 0000000..bc58b69
--- /dev/null
+++ b/rpms/vmselect/Dockerfile
@@ -0,0 +1,23 @@
+FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+
+# Create output directory for RPMs
+RUN mkdir -p /app/dist
+
+# Set working directory
+WORKDIR /app
+
+ARG PACKAGE_RELEASE
+ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
+ARG PACKAGE_VERSION
+ENV PACKAGE_VERSION=${PACKAGE_VERSION}
+
+# Copy nfpm.yaml from the context into the container
+COPY resources /app/resources
+
+# Download the required files
+RUN wget -O /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz \
+    https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz && \
+    tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz
+
+# Default command to build RPMs
+CMD /app/resources/build.sh
diff --git a/rpms/vmselect/resources/build.sh b/rpms/vmselect/resources/build.sh
new file mode 100755
index 0000000..ae730e3
--- /dev/null
+++ b/rpms/vmselect/resources/build.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
diff --git a/rpms/victoriametrics/resources/vmselect.yaml b/rpms/vmselect/resources/nfpm.yaml
similarity index 100%
rename from rpms/victoriametrics/resources/vmselect.yaml
rename to rpms/vmselect/resources/nfpm.yaml
diff --git a/rpms/vmstorage/1.119.0/release b/rpms/vmstorage/1.119.0/release
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/rpms/vmstorage/1.119.0/release
@@ -0,0 +1 @@
+1
diff --git a/rpms/vmstorage/Dockerfile b/rpms/vmstorage/Dockerfile
new file mode 100644
index 0000000..bc58b69
--- /dev/null
+++ b/rpms/vmstorage/Dockerfile
@@ -0,0 +1,23 @@
+FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+
+# Create output directory for RPMs
+RUN mkdir -p /app/dist
+
+# Set working directory
+WORKDIR /app
+
+ARG PACKAGE_RELEASE
+ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
+ARG PACKAGE_VERSION
+ENV PACKAGE_VERSION=${PACKAGE_VERSION}
+
+# Copy nfpm.yaml from the context into the container
+COPY resources /app/resources
+
+# Download the required files
+RUN wget -O /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz \
+    https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz && \
+    tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz
+
+# Default command to build RPMs
+CMD /app/resources/build.sh
diff --git a/rpms/vmstorage/resources/build.sh b/rpms/vmstorage/resources/build.sh
new file mode 100755
index 0000000..ae730e3
--- /dev/null
+++ b/rpms/vmstorage/resources/build.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
diff --git a/rpms/victoriametrics/resources/vmstorage.yaml b/rpms/vmstorage/resources/nfpm.yaml
similarity index 100%
rename from rpms/victoriametrics/resources/vmstorage.yaml
rename to rpms/vmstorage/resources/nfpm.yaml