diff --git a/install/hst-install-rhel.sh b/install/hst-install-rhel.sh
index 5fa74e5..94f303b 100755
--- a/install/hst-install-rhel.sh
+++ b/install/hst-install-rhel.sh
@@ -1313,7 +1313,7 @@ if [ "$apache" = 'yes' ]; then
 	mkdir -p /etc/httpd/conf.d/domains
 
 	# Copy configuration files
-	cp -f $HESTIA_INSTALL_DIR/httpd/httpd.conf /etc/httpd/
+	cp -f $HESTIA_INSTALL_DIR/httpd/httpd.conf /etc/httpd/conf/
 	cp -f $HESTIA_INSTALL_DIR/httpd/status.conf /etc/httpd/conf.d/hestia-status.conf
 	cp -f $HESTIA_INSTALL_DIR/logrotate/httpd /etc/logrotate.d/
 
@@ -1342,7 +1342,7 @@ if [ "$apache" = 'yes' ]; then
 	fi
 	echo "# Powered by hestia" > /etc/httpd/sites-available/default
 	echo "# Powered by hestia" > /etc/httpd/sites-available/default-ssl
-	echo "# Powered by hestia" > /etc/httpd/ports.conf
+	echo "# Powered by hestia" > /etc/httpd/conf/ports.conf
 	# echo -e "/home\npublic_html/cgi-bin" > /etc/httpd/suexec/www-data
 	touch /var/log/httpd/access.log /var/log/httpd/error.log
 	mkdir -p /var/log/httpd/domains
diff --git a/install/rpm/templates/web/apache2/default.stpl b/install/rpm/templates/web/httpd/default.stpl
similarity index 100%
rename from install/rpm/templates/web/apache2/default.stpl
rename to install/rpm/templates/web/httpd/default.stpl
diff --git a/install/rpm/templates/web/apache2/default.tpl b/install/rpm/templates/web/httpd/default.tpl
similarity index 100%
rename from install/rpm/templates/web/apache2/default.tpl
rename to install/rpm/templates/web/httpd/default.tpl
diff --git a/install/rpm/templates/web/apache2/hosting.stpl b/install/rpm/templates/web/httpd/hosting.stpl
similarity index 100%
rename from install/rpm/templates/web/apache2/hosting.stpl
rename to install/rpm/templates/web/httpd/hosting.stpl
diff --git a/install/rpm/templates/web/apache2/hosting.tpl b/install/rpm/templates/web/httpd/hosting.tpl
similarity index 100%
rename from install/rpm/templates/web/apache2/hosting.tpl
rename to install/rpm/templates/web/httpd/hosting.tpl
diff --git a/install/rpm/templates/web/apache2/php-fpm/default.stpl b/install/rpm/templates/web/httpd/php-fpm/default.stpl
similarity index 100%
rename from install/rpm/templates/web/apache2/php-fpm/default.stpl
rename to install/rpm/templates/web/httpd/php-fpm/default.stpl
diff --git a/install/rpm/templates/web/apache2/php-fpm/default.tpl b/install/rpm/templates/web/httpd/php-fpm/default.tpl
similarity index 100%
rename from install/rpm/templates/web/apache2/php-fpm/default.tpl
rename to install/rpm/templates/web/httpd/php-fpm/default.tpl
diff --git a/install/rpm/templates/web/apache2/phpcgi.sh b/install/rpm/templates/web/httpd/phpcgi.sh
similarity index 100%
rename from install/rpm/templates/web/apache2/phpcgi.sh
rename to install/rpm/templates/web/httpd/phpcgi.sh
diff --git a/install/rpm/templates/web/apache2/phpcgi.stpl b/install/rpm/templates/web/httpd/phpcgi.stpl
similarity index 100%
rename from install/rpm/templates/web/apache2/phpcgi.stpl
rename to install/rpm/templates/web/httpd/phpcgi.stpl
diff --git a/install/rpm/templates/web/apache2/phpcgi.tpl b/install/rpm/templates/web/httpd/phpcgi.tpl
similarity index 100%
rename from install/rpm/templates/web/apache2/phpcgi.tpl
rename to install/rpm/templates/web/httpd/phpcgi.tpl
diff --git a/install/rpm/templates/web/apache2/phpfcgid.sh b/install/rpm/templates/web/httpd/phpfcgid.sh
similarity index 100%
rename from install/rpm/templates/web/apache2/phpfcgid.sh
rename to install/rpm/templates/web/httpd/phpfcgid.sh
diff --git a/install/rpm/templates/web/apache2/phpfcgid.stpl b/install/rpm/templates/web/httpd/phpfcgid.stpl
similarity index 100%
rename from install/rpm/templates/web/apache2/phpfcgid.stpl
rename to install/rpm/templates/web/httpd/phpfcgid.stpl
diff --git a/install/rpm/templates/web/apache2/phpfcgid.tpl b/install/rpm/templates/web/httpd/phpfcgid.tpl
similarity index 100%
rename from install/rpm/templates/web/apache2/phpfcgid.tpl
rename to install/rpm/templates/web/httpd/phpfcgid.tpl
diff --git a/install/rpm/templates/web/apache2/www-data.stpl b/install/rpm/templates/web/httpd/www-data.stpl
similarity index 100%
rename from install/rpm/templates/web/apache2/www-data.stpl
rename to install/rpm/templates/web/httpd/www-data.stpl
diff --git a/install/rpm/templates/web/apache2/www-data.tpl b/install/rpm/templates/web/httpd/www-data.tpl
similarity index 100%
rename from install/rpm/templates/web/apache2/www-data.tpl
rename to install/rpm/templates/web/httpd/www-data.tpl