diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh
new file mode 100755
index 000000000..4ae7beec1
--- /dev/null
+++ b/.github/scripts/.build.zsh
@@ -0,0 +1,296 @@
+#!/usr/bin/env zsh
+
+builtin emulate -L zsh
+setopt EXTENDED_GLOB
+setopt PUSHD_SILENT
+setopt ERR_EXIT
+setopt ERR_RETURN
+setopt NO_UNSET
+setopt PIPE_FAIL
+setopt NO_AUTO_PUSHD
+setopt NO_PUSHD_IGNORE_DUPS
+setopt FUNCTION_ARGZERO
+
+## Enable for script debugging
+#setopt WARN_CREATE_GLOBAL
+#setopt WARN_NESTED_VAR
+#setopt XTRACE
+
+autoload -Uz is-at-least && if ! is-at-least 5.2; then
+  print -u2 -PR "%F{1}${funcstack[1]##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade Zsh to fix this issue."
+  exit 1
+fi
+
+TRAPEXIT() {
+  local return_value=$?
+
+  if (( ${+CI} )) unset NSUnbufferedIO
+
+  return ${return_value}
+}
+
+TRAPZERR() {
+  if (( ${_loglevel:-3} > 2 )) {
+    print -u2 -PR "${CI:+::error::}%F{1}    ✖︎ script execution error%f"
+    print -PR -e "
+    Callstack:
+    ${(j:\n     :)funcfiletrace}
+    "
+  }
+
+  exit 2
+}
+
+build() {
+  if (( ! ${+SCRIPT_HOME} )) typeset -g SCRIPT_HOME=${ZSH_ARGZERO:A:h}
+  local host_os=${${(s:-:)ZSH_ARGZERO:t:r}[2]}
+  local project_root=${SCRIPT_HOME:A:h:h}
+  local buildspec_file=${project_root}/buildspec.json
+
+  fpath=(${SCRIPT_HOME}/utils.zsh ${fpath})
+  autoload -Uz log_group log_info log_status log_error log_output set_loglevel check_${host_os} setup_ccache
+
+  if [[ ! -r ${buildspec_file} ]] {
+    log_error \
+      'No buildspec.json found. Please create a build specification for your project.' \
+      'A buildspec.json.template file is provided in the repository to get you started.'
+    return 2
+  }
+
+  typeset -g -a skips=()
+  local -i verbosity=1
+  local -r _version='1.0.0'
+  local -r -a _valid_targets=(
+    macos-x86_64
+    macos-arm64
+  )
+  local target
+  local config='RelWithDebInfo'
+  local -r -a _valid_configs=(Debug RelWithDebInfo Release MinSizeRel)
+  local -i codesign=0
+
+  if [[ ${host_os} == linux ]] {
+    local -r -a _valid_generators=(Ninja 'Unix Makefiles')
+    local generator='Ninja'
+    local -r _usage_host="
+%F{yellow} Additional options for Linux builds%f
+ -----------------------------------------------------------------------------
+  %B--generator%b                       Specify build system to generate
+                                    Available generators:
+                                      - Ninja
+                                      - Unix Makefiles"
+  } elif [[ ${host_os} == macos ]] {
+    local -r _usage_host="
+%F{yellow} Additional options for macOS builds%f
+ -----------------------------------------------------------------------------
+  %B-s | --codesign%b                   Enable codesigning (macOS only)"
+  }
+
+  local -i _print_config=0
+  local -r _usage="
+Usage: %B${functrace[1]%:*}%b <option> [<options>]
+
+%BOptions%b:
+
+%F{yellow} Build configuration options%f
+ -----------------------------------------------------------------------------
+  %B-t | --target%b                     Specify target - default: %B%F{green}${host_os}-${CPUTYPE}%f%b
+  %B-c | --config%b                     Build configuration
+  %B--print-config%b                    Print composed CMake configuration parameters
+  %B--skip-[all|build|deps]%b           Skip all|building OBS|checking for dependencies
+
+%F{yellow} Output options%f
+ -----------------------------------------------------------------------------
+  %B-q | --quiet%b                      Quiet (error output only)
+  %B-v | --verbose%b                    Verbose (more detailed output)
+  %B--debug%b                           Debug (very detailed and added output)
+
+%F{yellow} General options%f
+ -----------------------------------------------------------------------------
+  %B-h | --help%b                       Print this usage help
+  %B-V | --version%b                    Print script version information
+${_usage_host:-}"
+
+  local -a args
+  while (( # )) {
+    case ${1} {
+      -t|--target|--generator|-c|--config)
+        if (( # == 1 )) || [[ ${2:0:1} == '-' ]] {
+          log_error "Missing value for option %B${1}%b"
+          log_output ${_usage}
+          exit 2
+        }
+        ;;
+    }
+    case ${1} {
+      --)
+        shift
+        args+=($@)
+        break
+        ;;
+      -t|--target)
+        if (( ! ${_valid_targets[(Ie)${2}]} )) {
+          log_error "Invalid value %B${2}%b for option %B${1}%b"
+          log_output ${_usage}
+          exit 2
+        }
+        target=${2}
+        shift 2
+        ;;
+      -c|--config)
+        if (( ! ${_valid_configs[(Ie)${2}]} )) {
+          log_error "Invalid value %B${2}%b for option %B${1}%b"
+          log_output ${_usage}
+          exit 2
+        }
+        config=${2}
+        shift 2
+        ;;
+      -s|--codesign) codesign=1; shift ;;
+      -q|--quiet) (( verbosity -= 1 )) || true; shift ;;
+      -v|--verbose) (( verbosity += 1 )); shift ;;
+      -h|--help) log_output ${_usage}; exit 0 ;;
+      -V|--version) print -Pr "${_version}"; exit 0 ;;
+      --debug) verbosity=3; shift ;;
+      --generator)
+        if [[ ${host_os} == linux ]] {
+          if (( ! ${_valid_generators[(Ie)${2}]} )) {
+            log_error "Invalid value %B${2}%b for option %B${1}%b"
+            log_output ${_usage}
+            exit 2
+          }
+          generator=${2}
+        }
+        shift 2
+        ;;
+      --print-config) _print_config=1; skips+=(unpack deps); shift ;;
+      --skip-*)
+        local _skip="${${(s:-:)1}[-1]}"
+        local _check=(all deps build)
+        (( ${_check[(Ie)${_skip}]} )) || log_warning "Invalid skip mode %B${_skip}%b supplied"
+        skips+=(${_skip})
+        shift
+        ;;
+      *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
+    }
+  }
+
+  : "${target:="${host_os}-${CPUTYPE}"}"
+
+  set -- ${(@)args}
+  set_loglevel ${verbosity}
+
+  if (( ! (${skips[(Ie)all]} + ${skips[(Ie)deps]}) )) {
+    check_${host_os}
+  }
+  setup_ccache
+
+  if [[ ${host_os} == linux ]] {
+    autoload -Uz setup_linux && setup_linux
+  }
+
+  local product_name
+  read -r product_name <<< \
+    "$(jq -r '.name' ${buildspec_file})"
+
+  pushd ${project_root}
+  if (( ! (${skips[(Ie)all]} + ${skips[(Ie)build]}) )) {
+    log_group "Configuring ${product_name}..."
+
+    local -a cmake_args=()
+    local -a cmake_build_args=(--build)
+    local -a cmake_install_args=(--install)
+
+    case ${_loglevel} {
+      0) cmake_args+=(-Wno_deprecated -Wno-dev --log-level=ERROR) ;;
+      1) ;;
+      2) cmake_build_args+=(--verbose) ;;
+      *) cmake_args+=(--debug-output) ;;
+    }
+
+    case ${target} {
+      macos-*)
+        cmake_args+=(
+          --preset "macos${CI:+-ci}"
+          -DCMAKE_OSX_ARCHITECTURES:STRING=${target##*-}
+        )
+
+        if (( ${+CI} )) typeset -gx NSUnbufferedIO=YES
+
+        if (( codesign )) {
+          autoload -Uz read_codesign_team && read_codesign_team
+
+          if [[ -z ${CODESIGN_TEAM} ]] {
+            autoload -Uz read_codesign && read_codesign
+          }
+        }
+
+        cmake_args+=(
+          -DOBS_CODESIGN_TEAM:STRING=${CODESIGN_TEAM:-}
+          -DOBS_CODESIGN_IDENTITY:STRING=${CODESIGN_IDENT:--}
+        )
+        ;;
+    }
+
+    if (( _print_config )) { log_output "CMake configuration: ${cmake_args}"; exit 0 }
+
+    log_debug "Attempting to configure with CMake arguments: ${cmake_args}"
+    cmake -S ${project_root} ${cmake_args}
+
+    log_group "Building ${product_name}..."
+    if [[ ${host_os} == macos ]] {
+      local -a build_args=(
+        ONLY_ACTIVE_ARCH=NO
+        -project obs-studio.xcodeproj
+        -target obs-studio
+        -destination "generic/platform=macOS,name=Any Mac"
+        -configuration ${config}
+        -parallelizeTargets
+        -hideShellScriptEnvironment
+        build
+      )
+
+      local -a archive_args=(
+        ONLY_ACTIVE_ARCH=NO
+        -project obs-studio.xcodeproj
+        -scheme obs-studio
+        -destination "generic/platform=macOS,name=Any Mac"
+        -archivePath obs-studio.xcarchive
+        -parallelizeTargets
+        -hideShellScriptEnvironment
+        archive
+      )
+
+      local -a export_args=(
+        -exportArchive
+        -archivePath obs-studio.xcarchive
+        -exportOptionsPlist exportOptions.plist
+        -exportPath ${project_root}/build_macos
+      )
+
+      autoload -Uz run_xcodebuild
+      pushd build_macos
+      if (( ${+CI} )) && [[ ${GITHUB_EVENT_NAME} == push && ${GITHUB_REF_NAME} =~ [0-9]+.[0-9]+.[0-9]+(-(rc|beta).+)? ]] {
+        run_xcodebuild ${archive_args}
+        run_xcodebuild ${export_args}
+      } else {
+        run_xcodebuild ${build_args}
+
+        rm -rf OBS.app
+        mkdir OBS.app
+        ditto UI/${config}/OBS.app OBS.app
+      }
+      popd
+    } else {
+      cmake ${cmake_build_args}
+
+      log_group "Installing ${product_name}..."
+      if (( _loglevel > 1 )) cmake_install_args+=(--verbose)
+      cmake ${cmake_install_args}
+      popd
+    }
+  log_group
+  }
+}
+
+build ${@}
diff --git a/.github/scripts/.package.zsh b/.github/scripts/.package.zsh
new file mode 100755
index 000000000..0e5308410
--- /dev/null
+++ b/.github/scripts/.package.zsh
@@ -0,0 +1,266 @@
+#!/usr/bin/env zsh
+
+builtin emulate -L zsh
+setopt EXTENDED_GLOB
+setopt PUSHD_SILENT
+setopt ERR_EXIT
+setopt ERR_RETURN
+setopt NO_UNSET
+setopt PIPE_FAIL
+setopt NO_AUTO_PUSHD
+setopt NO_PUSHD_IGNORE_DUPS
+setopt FUNCTION_ARGZERO
+
+## Enable for script debugging
+#setopt WARN_CREATE_GLOBAL
+#setopt WARN_NESTED_VAR
+#setopt XTRACE
+
+autoload -Uz is-at-least && if ! is-at-least 5.2; then
+  print -u2 -PR "%F{1}${funcstack[1]##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade Zsh to fix this issue."
+  exit 1
+fi
+
+TRAPEXIT() {
+  local return_value=$?
+
+  if (( ${+CI} )) {
+    unset NSUnbufferedIO
+  }
+
+  return ${return_value}
+}
+
+TRAPZERR() {
+  if (( ${_loglevel:-3} > 2 )) {
+    print -u2 -PR "${CI:+::error::}%F{1}    ✖︎ script execution error%f"
+    print -PR -e "
+    Callstack:
+    ${(j:\n     :)funcfiletrace}
+    "
+  }
+
+  exit 2
+}
+
+package() {
+  if (( ! ${+SCRIPT_HOME} )) typeset -g SCRIPT_HOME=${ZSH_ARGZERO:A:h}
+  local host_os=${${(s:-:)ZSH_ARGZERO:t:r}[2]}
+  local project_root=${SCRIPT_HOME:A:h:h}
+  local buildspec_file=${project_root}/buildspec.json
+
+  fpath=(${SCRIPT_HOME}/utils.zsh ${fpath})
+  autoload -Uz set_loglevel log_info log_error log_output check_${host_os}
+
+  local -i verbosity=1
+  local -r _version='1.0.0'
+  local -r -a _valid_targets=(
+    macos-x86_64
+    macos-arm64
+    linux-x86_64
+  )
+  local target
+  local config='RelWithDebInfo'
+  local -r -a _valid_configs=(Debug RelWithDebInfo Release MinSizeRel)
+  local -i codesign=0
+  local -i notarize=0
+  local -i package=0
+  local -i skip_deps=0
+
+  if [[ ${host_os} == macos ]] {
+    local -r _usage_host="
+%F{yellow} Additional options for macOS builds%f
+ -----------------------------------------------------------------------------
+  %B-s | --codesign%b                   Enable codesigning (macOS only)
+  %B-n | --notarize%b                   Enable notarization (macOS only)"
+  }
+
+  local -r _usage="
+Usage: %B${functrace[1]%:*}%b <option> [<options>]
+
+%BOptions%b:
+
+%F{yellow} Package configuration options%f
+ -----------------------------------------------------------------------------
+  %B-t | --target%b                     Specify target - default: %B%F{green}${host_os}-${CPUTYPE}%f%b
+  %B-c | --config%b                     Build configuration
+  %B-p | --package%b                    Create package installer (macOS only)
+  %B--skip-deps%b                       Skip checking for dependencies
+
+%F{yellow} Output options%f
+ -----------------------------------------------------------------------------
+  %B-q | --quiet%b                      Quiet (error output only)
+  %B-v | --verbose%b                    Verbose (more detailed output)
+  %B--debug%b                           Debug (very detailed and added output)
+
+%F{yellow} General options%f
+ -----------------------------------------------------------------------------
+  %B-h | --help%b                       Print this usage help
+  %B-V | --version%b                    Print script version information
+${_usage_host:-}"
+
+  local -a args
+  while (( # )) {
+    case ${1} {
+      -t|--target|-c|--config)
+        if (( # == 1 )) || [[ ${2:0:1} == '-' ]] {
+          log_error "Missing value for option %B${1}%b"
+          log_output ${_usage}
+          exit 2
+        }
+        ;;
+    }
+    case ${1} {
+      --)
+        shift
+        args+=($@)
+        break
+        ;;
+      -t|--target)
+        if (( ! ${_valid_targets[(Ie)${2}]} )) {
+          log_error "Invalid value %B${2}%b for option %B${1}%b"
+          log_output ${_usage}
+          exit 2
+        }
+        target=${2}
+        shift 2
+        ;;
+      -c|--config)
+        if (( ! ${_valid_configs[(Ie)${2}]} )) {
+          log_error "Invalid value %B${2}%b for option %B${1}%b"
+          log_output ${_usage}
+          exit 2
+        }
+        config=${2}
+        shift 2
+        ;;
+      -s|--codesign) CODESIGN=1; shift ;;
+      -n|--notarize) NOTARIZE=1; shift ;;
+      -p|--package) typeset -g package=1; shift ;;
+      --skip-deps) typeset -g skip_deps=1; shift ;;
+      -q|--quiet) (( verbosity -= 1 )) || true; shift ;;
+      -v|--verbose) (( verbosity += 1 )); shift ;;
+      -h|--help) log_output ${_usage}; exit 0 ;;
+      -V|--version) print -Pr "${_version}"; exit 0 ;;
+      --debug) verbosity=3; shift ;;
+      *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
+    }
+  }
+
+  : "${target:="${host_os}-${CPUTYPE}"}"
+
+  set -- ${(@)args}
+  set_loglevel ${verbosity}
+
+  if (( ! skip_deps )) {
+    check_${host_os}
+  }
+
+  local product_name
+  read -r product_name <<< \
+    "$(jq -r '.name' ${buildspec_file})"
+
+  local commit_version='0.0.0'
+  local commit_distance='0'
+  local commit_hash
+
+  if [[ -d ${project_root}/.git ]] {
+    local git_description="$(git describe --tags --long)"
+    commit_version="${${git_description%-*}%-*}"
+    commit_hash="${git_description##*-g}"
+    commit_distance="${${git_description%-*}##*-}"
+  }
+
+
+  local output_name
+  if (( commit_distance > 0 )) {
+    output_name="obs-studio-${commit_version}-${commit_hash}"
+  } else {
+    output_name="obs-studio-${commit_version}"
+  }
+
+  if [[ ${host_os} == macos ]] {
+    autoload -Uz read_codesign read_codesign_pass log_warning log_group
+
+    if [[ ! -d build_macos/OBS.app ]] {
+      log_error 'No application bundle found. Run the build script to create a valid application bundle.'
+      return 0
+    }
+
+    local -A arch_names=(x86_64 Intel arm64 Apple)
+    output_name="${output_name}-macos-${(L)arch_names[${target##*-}]}"
+
+    local volume_name
+    if (( commit_distance > 0 )) {
+      volume_name="OBS Studio ${commit_version}-${commit_hash} (${arch_names[${target##*-}]})"
+    } else {
+      volume_name="OBS Studio ${commit_version} (${arch_names[${target##*-}]})"
+    }
+
+    local _tarflags='cJf'
+    if (( _loglevel > 1 || ${+CI} )) _tarflags="v${_tarflags}"
+
+    if (( package )) {
+      pushd build_macos
+
+      mkdir -p obs-studio/.background
+      cp ${project_root}/cmake/macos/resources/background.tiff obs-studio/.background/
+      cp ${project_root}/cmake/macos/resources/AppIcon.icns obs-studio/.VolumeIcon.icns
+      ln -s /Applications obs-studio/Applications
+
+      mkdir -p obs-studio/OBS.app
+      ditto OBS.app obs-studio/OBS.app
+
+      local -i _status=0
+
+      autoload -Uz create_diskimage
+      create_diskimage obs-studio ${volume_name} ${output_name} || _status=1
+
+      rm -r obs-studio
+      if (( _status )) {
+        log_error "Disk image creation failed."
+        return 2
+      }
+
+      if (( codesign )) { autoload -Uz read_codesign && read_codesign }
+
+      codesign --sign "${CODESIGN_IDENT:--}" ${output_name}.dmg
+
+      if (( codesign && notarize )) {
+        autoload -Uz read_codesign_pass && read_codesign_pass
+
+        xcrun notarytool submit "${output_name}".dmg --keychain-profile "OBS-Codesign-Password" --wait
+
+        local -i _status=0
+
+        xcrun stapler staple ${output_name}.dmg || _status=1
+
+        if (( _status )) {
+          log_error "Notarization failed. Use 'xcrun notarytool log <submission ID>' to check errors."
+          return 2
+        }
+      }
+      popd
+    } else {
+      log_group "Archiving obs-studio..."
+      pushd build_macos
+      XZ_OPT=-T0 tar "-${_tarflags}" ${output_name}.tar.xz OBS.app
+      popd
+    }
+
+    if [[ ${config} == Release ]] {
+      log_group "Archiving debug symbols..."
+      mkdir -p build_macos/dSYMs
+      pushd build_macos/dSYMs
+      rm -rf -- *.dSYM(N)
+      cp -pR ${PWD:h}/**/*.dSYM .
+      XZ_OPT=-T0 tar "-${_tarflags}" ${output_name}-dSYMs.tar.xz -- *
+      mv ${output_name}-dSYMs.tar.xz ${PWD:h}
+      popd
+    }
+
+    log_group
+  }
+}
+
+package ${@}
diff --git a/.github/scripts/build-macos b/.github/scripts/build-macos
new file mode 120000
index 000000000..43bea7f01
--- /dev/null
+++ b/.github/scripts/build-macos
@@ -0,0 +1 @@
+./.build.zsh
\ No newline at end of file
diff --git a/.github/scripts/package-macos b/.github/scripts/package-macos
new file mode 120000
index 000000000..aff469015
--- /dev/null
+++ b/.github/scripts/package-macos
@@ -0,0 +1 @@
+./.package.zsh
\ No newline at end of file
diff --git a/UI/cmake/macos/exportOptions-extension.plist.in b/UI/cmake/macos/exportOptions-extension.plist.in
index 2d213ef7b..bbd84e30e 100644
--- a/UI/cmake/macos/exportOptions-extension.plist.in
+++ b/UI/cmake/macos/exportOptions-extension.plist.in
@@ -9,9 +9,7 @@
 		<key>com.obsproject.obs-studio</key>
 		<string>${OBS_PROVISIONING_PROFILE}</string>
 	</dict>
-	<key>signingCertificate</key>
-	<string>${OBS_CODESIGN_IDENTITY}</string>
 	<key>signingStyle</key>
-	<string>manual</string>
+	<string>automatic</string>
 </dict>
 </plist>
diff --git a/UI/cmake/macos/exportOptions.plist.in b/UI/cmake/macos/exportOptions.plist.in
index f815ec3b7..688f50db2 100644
--- a/UI/cmake/macos/exportOptions.plist.in
+++ b/UI/cmake/macos/exportOptions.plist.in
@@ -4,9 +4,7 @@
 <dict>
 	<key>method</key>
 	<string>developer-id</string>
-	<key>signingCertificate</key>
-	<string>${OBS_CODESIGN_IDENTITY}</string>
 	<key>signingStyle</key>
-	<string>manual</string>
+	<string>automatic</string>
 </dict>
 </plist>
diff --git a/cmake/macos/resources/package.applescript b/cmake/macos/resources/package.applescript
index e33f16e3f..bc85859ab 100644
--- a/cmake/macos/resources/package.applescript
+++ b/cmake/macos/resources/package.applescript
@@ -61,7 +61,7 @@ on run (volumeName)
 
             if (do shell script "[ -f " & dsStore & " ]; echo $?") = "0" then set ejectMe to true
         end repeat
-        log "waited " & waitTime & " seconds for .DS_STORE to be created."
+        log "    >   Waited " & waitTime & " seconds for .DS_STORE to be created."
 
         tell disk (volumeName as string)
             close