diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3af981630..a2871ed96e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,6 +13,7 @@ on: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-wor
       - live
       - template
       - main
+      - modular-rewrite
     paths-ignore: # don't rebuild if only documentation has changed
       - "**.md"
   pull_request:
@@ -151,7 +152,7 @@ jobs:
       - name: Push To GHCR
         uses: redhat-actions/push-to-registry@v2
         id: push
-        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
+        # if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
         env:
           REGISTRY_USER: ${{ github.actor }}
           REGISTRY_PASSWORD: ${{ github.token }}
@@ -166,7 +167,7 @@ jobs:
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
-        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
+        # if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -174,7 +175,7 @@ jobs:
 
       # Sign container
       - uses: sigstore/cosign-installer@v3.1.2
-        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
+        # if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
 
       - name: Sign container image
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
@@ -186,6 +187,6 @@ jobs:
           COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
 
       - name: Echo outputs
-        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
+        # if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
         run: |
           echo "${{ toJSON(steps.push.outputs) }}"
diff --git a/boot_menu.yml b/boot_menu.yml
index 7a272cc55b..2cb27987f6 100644
--- a/boot_menu.yml
+++ b/boot_menu.yml
@@ -1,5 +1,5 @@
 ublue_variants:
-  - label: ublue-os/startingpoint
+  - label: gerblesh/usway-rewrite
     ks: /kickstart/ublue-os.ks
     flavors:
-      - label: startingpoint
\ No newline at end of file
+      - label: usway-rewrite
diff --git a/config/recipe-old.yml b/config/recipe-old.yml
deleted file mode 100644
index d1f3207a6f..0000000000
--- a/config/recipe-old.yml
+++ /dev/null
@@ -1,121 +0,0 @@
-# image will be published to ghcr.io/<user>/<name>
-name: usway-rewrite
-# description will be included in the image's metadata
-description: custom sericea image
-
-# the base image to build on top of (FROM) and the version tag to use
-base-image: ghcr.io/ublue-os/sericea-main
-image-version: 38 # latest is also supported if you want new updates ASAP
-
-# list of modules that will be executed in order
-# you can include multiple of the same module
-modules:
-  - type: rpm-ostree
-    repos: 
-      # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo
-    install:
-      - python3-pip # required for yafti
-      - libadwaita # required for yafti
-      - sway
-      - xdg-desktop-portal-wlr
-      - waybar
-      - xorg-x11-server-Xwayland
-      - xdg-user-dirs
-      # android
-      - android-tools
-      - android-file-transfer
-      # common utils
-      - swaybg
-      - swayidle
-      - swaylock
-      - power-profiles-daemon
-      - polkit-gnome
-      - libseat
-      - network-manager-applet
-      - system-config-printer
-      - firewall-config
-      - blueman
-      - thunar
-      - thunar-archive-plugin
-      - imv
-      - kvantum
-      - exa
-      - gnome-disk-utility
-      - mako
-      - xarchiver
-      - pavucontrol
-      # text editor
-      - lite-xl
-      # qt shiz
-      - qt5ct
-      - qt6ct
-      - qt6-qtwayland
-      - qt5-qtwayland
-      - qt5-qtgraphicaleffects
-      - qt5-qtquickcontrols2
-      - qt5-qtsvg
-      # launchers
-      - fuzzel
-      # terminals
-      - foot
-      # screenshotting
-      - grimshot
-      - wdisplays
-      - gnome-keyring
-      # fonts
-      - overpass-fonts
-      - overpass-mono-fonts
-      - google-noto-emoji-fonts
-      - google-noto-fonts-common
-      - google-roboto-fonts
-      - google-noto-sans-fonts
-      # config deps
-      - light
-      - fish
-      - wtype
-      - papirus-icon-theme
-      # audio
-      - pipewire
-      - wireplumber
-      - pipewire-alsa
-      - pipewire-jack-audio-connection-kit
-      - pipewire-pulseaudio
-      # git askpass
-      - ksshaskpass
-    remove:
-      - firefox # default firefox removed in favor of flatpak
-      - firefox-langpacks # langpacks needs to also be removed to prevent dependency problems
-      - toolbox
-      - sway-config-fedora
-      - dunst
-      - rofi-wayland
-      - jack-audio-connection-kit
-    optfix:
-      - Mullvad VPN
-
-  - type: yafti # if included, https://github.com/ublue-os/yafti will be installed and set up
-  custom-flatpaks: # this section is optional
-    - Mpv (Media Player): io.mpv.Mpv
-    - KWallet (Git Askpass): org.kde.kwalletmanager5
-    - adw-gtk3 (GTK Theme): org.gtk.Gtk3theme.adw-gtk3-dark
-
-  - type: bling # configure what to pull in from ublue-os/bling
-    install:
-      - fonts # selection of common good free fonts
-      - justfiles # add "!include /usr/share/ublue-os/just/bling.just"
-                  # in your custom.just (added by default) or local justfile
-      - nix-installer # shell shortcuts for determinate system's nix installers
-      - ublue-os-wallpapers
-      - ublue-update # https://github.com/ublue-os/ublue-update
-      # - dconf-update-service # a service unit that updates the dconf db on boot
-      # - devpod # https://devpod.sh/ as an rpm
-
-  - type: script
-    scripts:
-      # fetches local RPMs (Mullvad VPN)
-      - fetch-rpms.sh
-
-  - type: script
-    scripts:
-      # this sets up the proper policy & signing files for signed images to work
-      - signing.sh
diff --git a/config/recipe.yml b/config/recipe.yml
index 9b67dcb0ea..fffcbd933a 100644
--- a/config/recipe.yml
+++ b/config/recipe.yml
@@ -1,5 +1,5 @@
 # image will be published to ghcr.io/<user>/<name>
-name: usway
+name: usway-rewrite
 # description will be included in the image's metadata
 description: A starting point for further customization of uBlue images. Make your own! https://ublue.it/making-your-own/