diff --git a/SOURCES/0001-Remove-RHEL-specific-packages.patch b/SOURCES/0001-Remove-RHEL-specific-packages.patch
new file mode 100644
index 0000000..37ba558
--- /dev/null
+++ b/SOURCES/0001-Remove-RHEL-specific-packages.patch
@@ -0,0 +1,29 @@
+From 2c401f191bdba15ad46c34e245378dddd76e872e Mon Sep 17 00:00:00 2001
+From: Eugene Zamriy <eugene@zamriy.info>
+Date: Thu, 6 Apr 2023 23:34:20 +0300
+Subject: [PATCH] Remove RHEL specific packages
+
+
+diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
+index ac3fe06..1189a49 100644
+--- a/80-rhel/runtime-install.tmpl
++++ b/80-rhel/runtime-install.tmpl
+@@ -4,7 +4,6 @@
+ ## anaconda package
+ installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps
+ installpkg oscap-anaconda-addon
+-installpkg redhat-release-eula
+ 
+ ## FIXME Pull in device-mapper-multipath
+ ## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not
+@@ -163,7 +162,6 @@ installpkg google-noto-sans-cjk-ttc-fonts
+ ## debugging/bug reporting tools
+ installpkg gdb-gdbserver
+ installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader
+-installpkg libreport-rhel-anaconda-bugzilla
+ installpkg python3-pyatspi
+ 
+ ## extra tools not required by anaconda
+-- 
+2.39.2
+
diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec
index a4c1277..a725ae4 100644
--- a/SPECS/lorax-templates-rhel.spec
+++ b/SPECS/lorax-templates-rhel.spec
@@ -1,25 +1,29 @@
-Name:           lorax-templates-rhel
+Name:           lorax-templates-msvsphere
 Version:        9.0
 Release:        35%{?dist}
-Summary:        RHEL8 build templates for lorax and livemedia-creator
+Summary:        MSVSphere 9 build templates for lorax and livemedia-creator
 
 License:        GPLv2+
 URL:            https://github.com/weldr/lorax
 BuildArch:      noarch
 Source0:        lorax-templates-rhel-9.0-35.tar.gz
 
+# MSVSphere patches
+Patch1001:      0001-Remove-RHEL-specific-packages.patch
+
 # Required for the template branding support
 Requires:       lorax >= 34.9.1
 
 # Where are these supposed to end up?
-%define templatedir %{_datadir}/lorax/templates.d/80-rhel
+%define templatedir %{_datadir}/lorax/templates.d/70-msvsphere
 
 %description
-RHEL-specific Lorax templates for creating the boot.iso and live isos are
+MSVSphere 9 Lorax templates for creating the boot.iso and live isos are
 placed in %{templatedir}
 
 %prep
-%setup
+%setup -n lorax-templates-rhel-%{version}
+%patch1001 -p1
 
 %build
 # nothing to build
@@ -34,8 +38,10 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
-* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 9.0-35
-- Rebuilt for MSVSphere 9.1.
+* Thu Apr 06 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 9.0-35
+- Package renamed to lorax-templates-msvsphere
+- Removed RHEL-specific packages
+- Rebuilt for MSVSphere 9.1
 
 * Tue Apr 05 2022 Brian C. Lane <bcl@redhat.com> - 9.0-35
 - Makefile: Making it easier to create releases (bcl)