diff --git a/Makefile b/Makefile
index fda101d..8f31064 100644
--- a/Makefile
+++ b/Makefile
@@ -45,8 +45,7 @@ LIBS_PKG = \
 	$(wildcard lib/util-pkg*.sh)
 
 SHARED_PKG = \
-	data/makepkg.conf \
-	data/base-devel-udev
+	data/makepkg.conf
 
 LIST_ISO = \
 	$(wildcard data/iso.list.d/*.list)
diff --git a/README.md b/README.md
index ceda0d8..17dafae 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ overriding
 ################ buildtree ###############
 
 # manjaro package tree
-# repo_tree=('core' 'extra' 'community' 'multilib' 'openrc')
+# repo_tree=('core' 'extra' 'community' 'multilib')
 
 # host_tree=https://github.com/manjaro
 
@@ -92,16 +92,13 @@ overriding
 # build_list_iso=default
 
 # the dist release; default: auto
-# dist_release=17.0
+# dist_release=17.1
 
 # the branding; default: auto
 # dist_branding="MJRO"
 
-# possible values: openrc,systemd
-# initsys="systemd"
-
 # unset defaults to given value
-# kernel="linux49"
+# kernel="linux414"
 
 # gpg key; leave empty or commented to skip sfs signing
 # gpgkey=""
@@ -111,6 +108,9 @@ overriding
 # the server user
 # account=[SetUser]
 
+# the server project: manjaro|manjaro-community
+# project="[SetProject]"
+
 # set upload bandwidth limit in kB/s
 # limit=100
 
@@ -136,19 +136,18 @@ It it run in a abs/pkgbuilds directory which contains directories with PKGBUILD.
 ~~~
 $ buildpkg -h
 Usage: buildpkg [options]
-    -p <pkg>           Buildset or pkg [default: default]
     -a <arch>          Arch [default: auto]
     -b <branch>        Branch [default: stable]
+    -c                 Recreate chroot
+    -h                 This help
+    -i <pkg>           Install a package into the working copy of the chroot
+    -n                 Install and run namcap check
+    -p <pkg>           Buildset or pkg [default: default]
+    -q                 Query settings and pretend build
     -r <dir>           Chroots directory
                        [default: /var/lib/manjaro-tools/buildpkg]
-    -i <pkg>           Install a package into the working copy of the chroot
-    -c                 Recreate chroot
-    -w                 Clean up cache and sources
-    -n                 Install and run namcap check
     -s                 Sign packages
-    -u                 udev base-devel group (no systemd)
-    -q                 Query settings and pretend build
-    -h                 This help
+    -w                 Clean up cache and sources
 ~~~
 
 ###### * build sysvinit package for both arches and branch testing:
@@ -181,16 +180,12 @@ The arch can also be set in manjaro-tools.conf, but under normal conditions, it
 ###### * -n
 * Installs the built package in the chroot and runs a namcap check
 
-###### * -u
-* Create udev build root (for eudev builds)
-
 ### 3. buildiso
 
 buildiso is used to build manjaro-iso-profiles. It is run insde the profiles folder.
 
 ##### Packages for livecd only:
 
-* manjaro-livecd-openrc
 * manjaro-livecd-systemd
 
 #### Arguments
@@ -198,28 +193,26 @@ buildiso is used to build manjaro-iso-profiles. It is run insde the profiles fol
 ~~~
 $ buildiso -h
 Usage: buildiso [options]
-    -p <profile>       Buildset or profile [default: default]
     -a <arch>          Arch [default: auto]
     -b <branch>        Branch [default: stable]
+    -c                 Disable clean work dir
+    -f                 Build full ISO (extra=true)
+    -g <key>           The gpg key for sfs signing
+                       [default: empty]
+    -h                 This help
+    -k <name>          Kernel to use
+                       [default: linux49]
+    -m                 Set SquashFS image mode to persistence
+    -p <profile>       Buildset or profile [default: default]
+    -q                 Query settings and pretend build
     -r <dir>           Chroots directory
                        [default: /var/lib/manjaro-tools/buildiso]
     -t <dir>           Target directory
                        [default: /var/cache/manjaro-tools/iso]
-    -k <name>          Kernel to use
-                       [default: linux49]
-    -i <name>          Init system to use
-                       [default: systemd]
-    -g <key>           The gpg key for sfs signing
-                       [default: empty]
-    -m                 Set SquashFS image mode to persistence
-    -c                 Disable clean work dir
-    -f                 Build full ISO (extra=true)
+    -v                 Verbose output to log file, show profile detail (-q)
     -x                 Build images only
     -z                 Generate iso only
                        Requires pre built images (-x)
-    -v                 Verbose output to log file, show profile detail (-q)
-    -q                 Query settings and pretend build
-    -h                 This help
 ~~~
 
 ###### * build xfce iso profile for both arches and branch testing on x86_64 build system
@@ -256,15 +249,14 @@ yaml files are used by calamares netinstall option from a specified url(netgroup
 ~~~
 $ check-yaml -h
 Usage: check-yaml [options]
-    -p <profile>       Buildset or profile [default: default]
     -a <arch>          Arch [default: auto]
-    -k <name>          Kernel to use[default: linux44]
-    -i <name>          Init system to use [default: systemd]
     -c                 Check also calamares yaml files generated for the profile
     -g                 Enable pacman group accepted for -p
-    -v                 Validate by schema
-    -q                 Query settings
     -h                 This help
+    -k <name>          Kernel to use[default: linux44]
+    -p <profile>       Buildset or profile [default: default]
+    -q                 Query settings
+    -v                 Validate by schema
 ~~~
 ###### * build xfce iso profile for both arches and branch testing on x86_64 build system
 
@@ -303,11 +295,11 @@ buildtree is a little tools to sync arch abs and manjaro PKGBUILD git repos.
 ~~~
 $ buildtree -h
 Usage: buildtree [options]
-    -s            Sync manjaro tree
     -a            Sync arch abs
     -c            Clean package tree
-    -q            Query settings
     -h            This help
+    -q            Query settings
+    -s            Sync manjaro tree
 ~~~
 
 ###### * sync arch and manjaro trees
@@ -328,8 +320,8 @@ If there is only 1 system installed besides the host system, no list will pop up
 $ manjaro-chroot -h
 usage: manjaro-chroot -a [or] manjaro-chroot chroot-dir [command]
     -a             Automount detected linux system
-    -q             Query settings and pretend
     -h             Print this help message
+    -q             Query settings and pretend
 
     If 'command' is unspecified, manjaro-chroot will launch /bin/sh.
 
@@ -361,14 +353,14 @@ Ideally, you have a running ssh agent on the host, and your key added, and your
 ~~~
 $ deployiso -h
 Usage: deployiso [options]
-    -p                 Source folder to upload [default:default]
-    -l                 Limit bandwidth in kB/s [default:80]
     -c                 Create new remote release directory
-    -u                 Update remote directory
-    -t                 Create iso torrent
-    -q                 Query settings and pretend upload
-    -v                 Verbose output
     -h                 This help
+    -l                 Limit bandwidth in kB/s [default:80]
+    -p                 Source folder to upload [default:default]
+    -q                 Query settings and pretend upload
+    -t                 Create iso torrent
+    -u                 Update remote directory
+    -v                 Verbose output
 ~~~
 
 ###### * upload official build list, ie all built iso defined in a build list
diff --git a/bin/buildiso.in b/bin/buildiso.in
index f52a569..0349e9d 100644
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -44,15 +44,9 @@ show_profile(){
         msg2 "addgroups: %s" "${addgroups}"
         [[ -n ${smb_workgroup} ]] && msg2 "smb_workgroup: %s" "${smb_workgroup}"
 
-        if [[ ${initsys} == 'systemd' ]]; then
-            msg2 "enable_systemd: %s" "${enable_systemd[*]}"
-            msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
-            [[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
-        else
-            msg2 "enable_openrc: %s" "${enable_openrc[*]}"
-            msg2 "enable_openrc_live: %s" "${enable_openrc_live[*]}"
-            [[ -n ${disable_openrc[*]} ]] && msg2 "disable_openrc: %s" "${disable_openrc[*]}"
-        fi
+        msg2 "enable_systemd: %s" "${enable_systemd[*]}"
+        msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
+        [[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
     fi
     reset_profile
 }
@@ -69,7 +63,6 @@ display_settings(){
     msg "OPTIONS:"
     msg2 "arch: %s" "${target_arch}"
     msg2 "branch: %s" "${target_branch}"
-    msg2 "initsys: %s" "${initsys}"
     msg2 "kernel: %s" "${kernel}"
     [[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
 
@@ -118,8 +111,6 @@ usage() {
     echo "                       [default: ${cache_dir_iso}]"
     echo '    -k <name>          Kernel to use'
     echo "                       [default: ${kernel}]"
-    echo '    -i <name>          Init system to use'
-    echo "                       [default: ${initsys}]"
     echo '    -g <key>           The gpg key for sfs signing'
     echo "                       [default: ${gpgkey}]"
     echo '    -m                 Set SquashFS image mode to persistence'
@@ -142,22 +133,21 @@ opts='p:a:b:r:t:k:i:g:cfzxmvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) build_list_iso="$OPTARG" ;;
         a) target_arch="$OPTARG" ;;
         b) target_branch="$OPTARG" ;;
-        r) chroots_iso="$OPTARG" ;;
-        t) cache_dir_iso="$OPTARG" ;;
-        k) kernel="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        g) gpgkey="$OPTARG" ;;
         c) clean_first=false ;;
         f) full_iso=true ;;
+        g) gpgkey="$OPTARG" ;;
+        h|?) usage 0 ;;
+        k) kernel="$OPTARG" ;;
+        m) persist=true ;;
+        p) build_list_iso="$OPTARG" ;;
+        q) pretend=true ;;
+        r) chroots_iso="$OPTARG" ;;
+        t) cache_dir_iso="$OPTARG" ;;
+        v) verbose=true ;;
         x) images_only=true ;;
         z) iso_only=true ;;
-        m) persist=true ;;
-        v) verbose=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
diff --git a/bin/buildpkg.in b/bin/buildpkg.in
index eb8223d..efd5535 100644
--- a/bin/buildpkg.in
+++ b/bin/buildpkg.in
@@ -53,7 +53,6 @@ display_settings(){
     msg2 "wipe_clean: %s" "${wipe_clean}"
     msg2 "namcap: %s" "${namcap}"
     msg2 "sign: %s" "${sign}"
-    msg2 "udev_root: %s" "${udev_root}"
 
     msg "PATHS:"
     msg2 "pkg_dir: %s" "${pkg_dir}"
@@ -80,24 +79,22 @@ namcap=false
 pretend=false
 is_build_list=false
 sign=false
-udev_root=false
 is_multilib=false
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -p <pkg>           Build list or pkg [default: ${build_list_pkg}]"
     echo "    -a <arch>          Arch [default: ${target_arch}]"
     echo "    -b <branch>        Branch [default: ${target_branch}]"
+    echo '    -c                 Recreate chroot'
+    echo '    -h                 This help'
+    echo '    -i <pkgs>          Install packages into the working copy of the chroot'
+    echo '    -n                 Install and run namcap check'
+    echo "    -p <pkg>           Build list or pkg [default: ${build_list_pkg}]"
+    echo '    -q                 Query settings and pretend build'
     echo '    -r <dir>           Chroots directory'
     echo "                       [default: ${chroots_pkg}]"
-    echo '    -i <pkgs>          Install packages into the working copy of the chroot'
-    echo '    -c                 Recreate chroot'
-    echo '    -w                 Clean up cache and sources'
-    echo '    -n                 Install and run namcap check'
     echo '    -s                 Sign packages'
-    echo '    -u                 Udev base-devel group (no systemd)'
-    echo '    -q                 Query settings and pretend build'
-    echo '    -h                 This help'
+    echo '    -w                 Clean up cache and sources'
     echo ''
     echo ''
     exit $1
@@ -109,18 +106,17 @@ opts='p:a:b:r:i:cwnsuqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) build_list_pkg="${OPTARG%/}" ;;
         a) target_arch="$OPTARG" ;;
         b) target_branch="$OPTARG" ;;
-        r) chroots_pkg="$OPTARG" ;;
-        i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
         c) clean_first=true ;;
-        w) wipe_clean=true ;;
-        n) namcap=true; mkchrootpkg_args+=(-n) ;;
-        s) sign=true ;;
-        u) udev_root=true ;;
-        q) pretend=true ;;
         h|?) usage 0 ;;
+        i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
+        n) namcap=true; mkchrootpkg_args+=(-n) ;;
+        p) build_list_pkg="${OPTARG%/}" ;;
+        q) pretend=true ;;
+        r) chroots_pkg="$OPTARG" ;;
+        s) sign=true ;;
+        w) wipe_clean=true ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
diff --git a/bin/check-yaml.in b/bin/check-yaml.in
index 6fcf24c..c5c41c7 100644
--- a/bin/check-yaml.in
+++ b/bin/check-yaml.in
@@ -44,15 +44,9 @@ show_profile(){
     msg2 "login_shell: %s" "${login_shell}"
     msg2 "addgroups: %s" "${addgroups}"
 
-    if [[ ${initsys} == 'systemd' ]]; then
-        msg2 "enable_systemd: %s" "${enable_systemd[*]}"
-        msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
-        [[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
-    else
-        msg2 "enable_openrc: %s" "${enable_openrc[*]}"
-        msg2 "enable_openrc_live: %s" "${enable_openrc_live[*]}"
-        [[ -n ${disable_openrc[*]} ]] && msg2 "disable_openrc: %s" "${disable_openrc[*]}"
-    fi
+    msg2 "enable_systemd: %s" "${enable_systemd[*]}"
+    msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
+    [[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
 
     reset_profile
     unset yaml_dir
@@ -69,7 +63,6 @@ display_settings(){
 
     msg "OPTIONS:"
     msg2 "arch: %s" "${target_arch}"
-    msg2 "initsys: %s" "${initsys}"
     msg2 "kernel: %s" "${kernel}"
 
     msg "ARGS:"
@@ -98,15 +91,14 @@ cache_dir_netinstall="${cache_dir}/netinstall"
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
     echo "    -a <arch>          Arch [default: ${target_arch}]"
-    echo "    -k <name>          Kernel to use[default: ${kernel}]"
-    echo "    -i <name>          Init system to use [default: ${initsys}]"
     echo '    -c                 Check also calamares yaml files generated for the profile'
     echo '    -g                 Enable pacman group accepted for -p'
-    echo '    -v                 Validate by schema'
-    echo '    -q                 Query settings'
     echo '    -h                 This help'
+    echo "    -k <name>          Kernel to use[default: ${kernel}]"
+    echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
+    echo '    -q                 Query settings'
+    echo '    -v                 Validate by schema'
     echo ''
     echo ''
     exit $1
@@ -118,15 +110,14 @@ opts='p:a:i:k:gcvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) build_list_iso="$OPTARG" ;;
         a) target_arch="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        k) kernel="$OPTARG" ;;
         c) calamares=true ;;
         g) group=true ;;
-        v) validate=true ;;
-        q) pretend=true ;;
         h|?) usage 0 ;;
+        k) kernel="$OPTARG" ;;
+        p) build_list_iso="$OPTARG" ;;
+        q) pretend=true ;;
+        v) validate=true ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
diff --git a/data/base-devel-udev b/data/base-devel-udev
deleted file mode 100644
index bae92e9..0000000
--- a/data/base-devel-udev
+++ /dev/null
@@ -1,29 +0,0 @@
-autoconf
-automake
-binutils
-bison
-libeudev
-fakeroot
-file
-findutils
-flex
-gawk
-gcc
-gettext
-grep
-groff
-gzip
-libtool
-m4
-make
-pacman
-patch
-pkg-config
-sed
-sudo
-texinfo
-util-linux-nosystemd
-which
->multilib gcc-multilib
->multilib lib32-fakeroot
->multilib lib32-libltdl
diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 21f65a1..85728c4 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -23,7 +23,7 @@
 ################ buildtree ###############
 
 # manjaro package tree
-# repo_tree=('core' 'extra' 'community' 'multilib' 'openrc')
+# repo_tree=('core' 'extra' 'community' 'multilib')
 
 # host_tree=https://github.com/manjaro
 
diff --git a/data/profile.conf.example b/data/profile.conf.example
index 3626641..cbd812a 100644
--- a/data/profile.conf.example
+++ b/data/profile.conf.example
@@ -58,8 +58,3 @@
 # names must match systemd service names
 # services in enable_systemd array don't need to be listed here
 # enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-
-# unset defaults to given values,
-# names must match openrc service names
-# services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
diff --git a/docbook/buildiso.xml b/docbook/buildiso.xml
index 91f7e41..baef87c 100644
--- a/docbook/buildiso.xml
+++ b/docbook/buildiso.xml
@@ -115,12 +115,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
                 <listitem><para>Help.</para></listitem>
             </varlistentry>
 
-            <varlistentry>
-                <term><option>-i systemd|openrc</option></term>
-
-                <listitem><para>The init system on the iso</para></listitem>
-            </varlistentry>
-
             <varlistentry>
                 <term><option>-k linuxXXX</option></term>
 
diff --git a/docbook/check-yaml.xml b/docbook/check-yaml.xml
index 53bf36d..119b7ac 100644
--- a/docbook/check-yaml.xml
+++ b/docbook/check-yaml.xml
@@ -81,12 +81,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
                 <listitem><para>Architecture that the yaml will be created for. Can be i686 or x86_64.</para></listitem>
             </varlistentry>
 
-            <varlistentry>
-                <term><option>-i systemd|openrc</option></term>
-
-                <listitem><para>The init system the yaml will be created for.</para></listitem>
-            </varlistentry>
-
             <varlistentry>
                 <term><option>-k linuxXXX</option></term>
 
diff --git a/docbook/manjaro-tools.conf.xml b/docbook/manjaro-tools.conf.xml
index a19b0bd..79eb714 100644
--- a/docbook/manjaro-tools.conf.xml
+++ b/docbook/manjaro-tools.conf.xml
@@ -132,7 +132,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
                 <term><varname>repo_tree=</varname></term>
 
                 <listitem><para>Manjaro package tree. Default is
-                "('core' 'extra' 'community' 'multilib' 'openrc')".
+                "('core' 'extra' 'community' 'multilib')".
                 </para></listitem>
             </varlistentry>
 
diff --git a/docbook/profile.conf.xml b/docbook/profile.conf.xml
index 2ae5391..d718bd7 100644
--- a/docbook/profile.conf.xml
+++ b/docbook/profile.conf.xml
@@ -152,14 +152,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
                 </para></listitem>
             </varlistentry>
 
-            <varlistentry>
-                <term><varname>enable_openrc=</varname></term>
-
-                <listitem><para>Array of services that will be
-                enabled in openrc systems.
-                </para></listitem>
-            </varlistentry>
-
             <varlistentry>
                 <term><varname>hostname=</varname></term>
 
@@ -209,14 +201,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
                 </para></listitem>
             </varlistentry>
 
-            <varlistentry>
-            <term><varname>enable_openrc_live=</varname></term>
-
-            <listitem><para>Array of services that will be
-            enabled in the openrc live-cd.
-            </para></listitem>
-        </varlistentry>
-
         </variablelist>
 
     </refsect1>
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 635c628..2fa4f7b 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -91,7 +91,7 @@ configure_lsb(){
 
 configure_logind(){
     msg2 "Configuring logind ..."
-    local conf=$1/etc/$2/logind.conf
+    local conf=$1/etc/systemd/logind.conf
     sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
     sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
     sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
@@ -104,27 +104,14 @@ configure_journald(){
 }
 
 configure_services(){
-    info "Configuring [%s]" "${initsys}"
-    case ${initsys} in
-        'openrc')
-            for svc in ${enable_openrc[@]}; do
-                [[ $svc == "xdm" ]] && set_xdm "$1"
-                add_svc_rc "$1" "$svc"
-            done
-            for svc in ${enable_openrc_live[@]}; do
-                add_svc_rc "$1" "$svc"
-            done
-        ;;
-        'systemd')
-            for svc in ${enable_systemd[@]}; do
-                add_svc_sd "$1" "$svc"
-            done
-            for svc in ${enable_systemd_live[@]}; do
-                add_svc_sd "$1" "$svc"
-            done
-        ;;
-    esac
-    info "Done configuring [%s]" "${initsys}"
+    info "Configuring services"
+    for svc in ${enable_systemd[@]}; do
+        add_svc_sd "$1" "$svc"
+    done
+    for svc in ${enable_systemd_live[@]}; do
+        add_svc_sd "$1" "$svc"
+    done
+    info "Done configuring services"
 }
 
 write_live_session_conf(){
@@ -160,24 +147,15 @@ configure_hosts(){
 }
 
 configure_system(){
-    case ${initsys} in
-        'systemd')
-            configure_logind "$1" "systemd"
-            configure_journald "$1"
+    configure_logind "$1"
+    configure_journald "$1"
 
-            # Prevent some services to be started in the livecd
-            echo 'File created by manjaro-tools. See systemd-update-done.service(8).' \
-            | tee "${path}/etc/.updated" >"${path}/var/.updated"
+    # Prevent some services to be started in the livecd
+    echo 'File created by manjaro-tools. See systemd-update-done.service(8).' \
+    | tee "${path}/etc/.updated" >"${path}/var/.updated"
 
-            msg2 "Disable systemd-gpt-auto-generator"
-            ln -sf /dev/null "${path}/usr/lib/systemd/system-generators/systemd-gpt-auto-generator"
-        ;;
-        'openrc')
-            configure_logind "$1" "elogind"
-#             local hn='hostname="'${hostname}'"'
-#             sed -i -e "s|^.*hostname=.*|${hn}|" $1/etc/conf.d/hostname
-        ;;
-    esac
+    msg2 "Disable systemd-gpt-auto-generator"
+    ln -sf /dev/null "${path}/usr/lib/systemd/system-generators/systemd-gpt-auto-generator"
     echo ${hostname} > $1/etc/hostname
 }
 
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 454de40..88445f5 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -219,7 +219,6 @@ gen_iso_fn(){
     if ! ${chrootcfg}; then
         [[ -n ${profile} ]] && vars+=("${profile}")
     fi
-    [[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
     vars+=("${dist_release}")
     vars+=("${target_branch}")
 
@@ -380,8 +379,7 @@ make_image_boot() {
 
 configure_grub(){
     local default_args="misobasedir=${iso_name} misolabel=${iso_label}" \
-        boot_args=('quiet')
-    [[ ${initsys} == 'systemd' ]] && boot_args+=('systemd.show_status=1')
+        boot_args=('quiet' 'systemd.show_status=1')
 
     sed -e "s|@DIST_NAME@|${dist_name}|g" \
         -e "s|@ARCH@|${target_arch}|g" \
@@ -420,10 +418,6 @@ check_requirements(){
         die "%s is not a valid branch!" "${target_branch}"
     fi
 
-    if ! is_valid_init "${initsys}"; then
-        die "%s is not a valid init system!" "${initsys}"
-    fi
-
     local iso_kernel=${kernel:5:1} host_kernel=$(uname -r)
     if [[ ${iso_kernel} < "4" ]] \
     || [[ ${host_kernel%%*.} < "4" ]]; then
diff --git a/lib/util-pkg-chroot.sh b/lib/util-pkg-chroot.sh
index dd2807e..3266f3c 100644
--- a/lib/util-pkg-chroot.sh
+++ b/lib/util-pkg-chroot.sh
@@ -69,39 +69,11 @@ find_pkg(){
     [[ -z $result ]] && die "%s is not a valid package or build list!" "$1"
 }
 
-load_group(){
-    local _multi \
-        _space="s| ||g" \
-        _clean=':a;N;$!ba;s/\n/ /g' \
-        _com_rm="s|#.*||g" \
-        devel_group='' \
-        file=${DATADIR}/base-devel-udev
-
-        info "Loading custom group: %s" "$file"
-
-    if ${is_multilib}; then
-        _multi="s|>multilib||g"
-    else
-        _multi="s|>multilib.*||g"
-    fi
-
-    devel_group=$(sed "$_com_rm" "$file" \
-            | sed "$_space" \
-            | sed "$_multi" \
-            | sed "$_clean")
-
-        echo ${devel_group}
-}
-
 init_base_devel(){
-    if ${udev_root}; then
-        base_packages=( "$(load_group)" )
+    if ${is_multilib}; then
+        base_packages=('base-devel' 'multilib-devel')
     else
-        if ${is_multilib}; then
-            base_packages=('base-devel' 'multilib-devel')
-        else
-            base_packages=('base-devel')
-        fi
+        base_packages=('base-devel')
     fi
 }
 
diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 9653f2d..d619ca2 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -13,19 +13,16 @@ write_machineid_conf(){
     local conf="${modules_dir}/machineid.conf" switch='false'
     msg2 "Writing %s ..." "${conf##*/}"
     echo '---' > "$conf"
-    [[ ${initsys} == 'systemd' ]] && switch='true'
-    echo "systemd: ${switch}" >> $conf
     echo "dbus: true" >> $conf
     echo "symlink: true" >> $conf
 }
 
 write_finished_conf(){
     msg2 "Writing %s ..." "finished.conf"
-    local conf="${modules_dir}/finished.conf" cmd="loginctl reboot"
+    local conf="${modules_dir}/finished.conf" cmd="systemctl reboot"
     echo '---' > "$conf"
     echo 'restartNowEnabled: true' >> "$conf"
     echo 'restartNowChecked: false' >> "$conf"
-    [[ ${initsys} == 'systemd' ]] && cmd="systemctl reboot"
     echo "restartNowCommand: \"${cmd}\"" >> "$conf"
 }
 
@@ -68,18 +65,6 @@ write_servicescfg_conf(){
     echo '' >> "$conf"
     echo 'services:' >> "$conf"
     echo '    enabled:' >> "$conf"
-    for s in ${enable_openrc[@]};do
-        echo "      - name: $s" >> "$conf"
-        echo '        runlevel: default' >> "$conf"
-    done
-    if [[ -n ${disable_openrc[@]} ]]; then
-        echo '    disabled:' >> "$conf"
-        for s in ${disable_openrc[@]};do
-            echo "      - name: $s" >> "$conf"
-            echo '        runlevel: default' >> "$conf"
-            echo '' >> "$conf"
-        done
-    fi
 }
 
 write_services_conf(){
@@ -245,7 +230,7 @@ get_yaml(){
     else
         args+=("${profile}/packages")
     fi
-    args+=("${initsys}")
+    args+=("systemd")
     for arg in ${args[@]};do
         yaml=${yaml:-}${yaml:+-}${arg}
     done
@@ -340,10 +325,7 @@ write_settings_conf(){
         msg2 "Skipping to set mhwdcfg module."
     fi
     echo "        - hwclock" >> "$conf"
-    case ${initsys} in
-        'systemd') echo "        - services" >> "$conf" && write_services_conf ;;
-        'openrc') echo "        - servicescfg" >> "$conf" && write_servicescfg_conf ;;
-    esac
+    echo "        - services" >> "$conf" && write_services_conf
     echo "        - grubcfg" >> "$conf"
     echo "        - bootloader" >> "$conf" && write_bootloader_conf
     if ${oem_used}; then
@@ -440,7 +422,7 @@ prepare_check(){
 }
 
 gen_fn(){
-    echo "${yaml_dir}/$1-${target_arch}-${initsys}.yaml"
+    echo "${yaml_dir}/$1-${target_arch}-systemd.yaml"
 }
 
 make_profile_yaml(){
diff --git a/lib/util.sh b/lib/util.sh
index f92d266..dbc7d94 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -221,7 +221,7 @@ init_buildtree(){
 
     tree_dir_abs=${tree_dir}/packages-archlinux
 
-    [[ -z ${repo_tree[@]} ]] && repo_tree=('core' 'extra' 'community' 'multilib' 'openrc')
+    [[ -z ${repo_tree[@]} ]] && repo_tree=('core' 'extra' 'community' 'multilib')
 
     [[ -z ${host_tree} ]] && host_tree='https://github.com/manjaro'
 
@@ -313,8 +313,6 @@ init_buildiso(){
 
     iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
 
-    [[ -z ${initsys} ]] && initsys="systemd"
-
     [[ -z ${kernel} ]] && kernel="linux414"
 
     [[ -z ${gpgkey} ]] && gpgkey=''
@@ -449,10 +447,7 @@ reset_profile(){
     unset addgroups
     unset enable_systemd
     unset disable_systemd
-    unset enable_openrc
-    unset disable_openrc
     unset enable_systemd_live
-    unset enable_openrc_live
     unset packages_desktop
     unset packages_mhwd
     unset login_shell
@@ -504,18 +499,6 @@ check_profile(){
 load_pkgs(){
     info "Loading Packages: [%s] ..." "${1##*/}"
 
-    local _init _init_rm
-    case "${initsys}" in
-        'openrc')
-            _init="s|>openrc||g"
-            _init_rm="s|>systemd.*||g"
-        ;;
-        *)
-            _init="s|>systemd||g"
-            _init_rm="s|>openrc.*||g"
-        ;;
-    esac
-
     local _multi _nonfree_default _nonfree_multi _arch _arch_rm _nonfree_i686 _nonfree_x86_64 _basic _basic_rm _extra _extra_rm
 
     if ${basic}; then
@@ -717,13 +700,6 @@ create_min_fs(){
     mkdir -m 0555 -p $1/{sys,proc}
 }
 
-is_valid_init(){
-    case $1 in
-        'openrc'|'systemd') return 0 ;;
-        *) return 1 ;;
-    esac
-}
-
 is_valid_arch_pkg(){
     eval "case $1 in
         $(show_build_profiles "${make_conf_dir}")) return 0 ;;