diff --git a/fedora-packager.spec b/fedora-packager.spec
index a645e2a..94ae68d 100644
--- a/fedora-packager.spec
+++ b/fedora-packager.spec
@@ -19,7 +19,6 @@ Source13:       fedoraproject_org
 Source14:       stg_fedoraproject_org
 Source15:       fedoraproject_ipa_ca.crt
 Source16:       stg_fedoraproject_ipa_ca.crt
-Source17:       riscv.conf
 
 BuildRequires:  python3-devel
 
@@ -87,12 +86,12 @@ Requires:       krb5-pkinit
 install -D %{SOURCE0} %{buildroot}%{_licensedir}/%{name}/COPYING
 install -D %{SOURCE2} %{buildroot}%{_bindir}/pkgname
 install -D %{SOURCE3} %{buildroot}%{_bindir}/rpmbuild-md5
+install -D %{SOURCE4} %{buildroot}%{_bindir}/s390-koji
 install -D %{SOURCE4} %{buildroot}%{_bindir}/stg-koji
-install -D %{SOURCE4} %{buildroot}%{_bindir}/riscv-koji
 install -D %{SOURCE5} %{buildroot}%{_bindir}/fkinit
 
 install -m0644 -Dt %{buildroot}%{_sysconfdir}/koji.conf.d/ \
-  %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE17}
+  %{SOURCE10} %{SOURCE11} %{SOURCE12}
 install -m0644 -Dt %{buildroot}%{_sysconfdir}/krb5.conf.d/ \
   %{SOURCE13} %{SOURCE14}
 install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \
@@ -102,7 +101,7 @@ install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \
 %license %{_licensedir}/%{name}/
 %{_bindir}/pkgname
 %{_bindir}/rpmbuild-md5
-%{_bindir}/riscv-koji
+%{_bindir}/s390-koji
 %{_bindir}/stg-koji
 %config(noreplace) %{_sysconfdir}/koji.conf.d/*
 
diff --git a/fedoraproject_org b/fedoraproject_org
index 5f8732a..4f2dd10 100644
--- a/fedoraproject_org
+++ b/fedoraproject_org
@@ -2,7 +2,6 @@
  FEDORAPROJECT.ORG = {
         kdc = https://id.fedoraproject.org/KdcProxy
         pkinit_anchors = FILE:/etc/pki/ipa/fedoraproject_ipa_ca.crt
-        auto_fast_armor = true
  }
 [domain_realm]
  .fedoraproject.org = FEDORAPROJECT.ORG
diff --git a/fkinit b/fkinit
index 537edc0..d2add1a 100755
--- a/fkinit
+++ b/fkinit
@@ -28,19 +28,15 @@ begins_with_short_option()
 }
 
 # THE DEFAULTS INITIALIZATION - OPTIONALS
+_arg_user="$USER"
 _arg_staging="off"
-if [ -f "$HOME/.fedora.upn" ]; then
-	_arg_user=$(<"$HOME/.fedora.upn")
-else
-	_arg_user="$USER"
-fi
 
 
 print_help()
 {
 	printf '%s\n' "Acquire a Kerberos ticket-granting ticket for Fedora"
 	printf 'Usage: %s [-u|--user <arg>] [--(no-)staging] [-h|--help]\n' "$0"
-	printf '\t%s\n' "-u, --user: Fedora account name (default: value in ~/.fedora.upn if exists, otherwise '$USER')"
+	printf '\t%s\n' "-u, --user: Fedora account name (default: '$USER')"
 	printf '\t%s\n' "--staging, --no-staging: Use the staging infrastructure (off by default)"
 	printf '\t%s\n' "-h, --help: Prints help"
 	printf '\n%s\n' "If the environment variable \$FKINIT_OTP is set, it will be read for the one-time password instead of prompting for it."
@@ -109,8 +105,8 @@ fi
 
 kinit -n @$domain -c FILE:$armorcache
 
-F_PASSWORD=$(systemd-ask-password --timeout=0 "FAS password:")
-F_OTP=${FKINIT_OTP:-$(systemd-ask-password --timeout=0 "FAS OTP (leave blank if not configured):")}
+F_PASSWORD=$(systemd-ask-password "FAS password:")
+F_OTP=${FKINIT_OTP:-$(systemd-ask-password "FAS OTP (leave blank if not configured):")}
 
 kinit -T FILE:$armorcache $_arg_user@$domain <<< "${F_PASSWORD}${F_OTP}" >/dev/null
 unset F_PASSWORD
diff --git a/riscv.conf b/riscv.conf
deleted file mode 100644
index 42c66db..0000000
--- a/riscv.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[riscv]
-
-;configuration for koji cli tool
-
-;url of XMLRPC server
-server = https://riscv-koji.fedoraproject.org/kojihub
-
-;url of web interface
-weburl = https://riscv-koji.fedoraproject.org/koji
-
-;url of package download site
-topurl = https://riscv-kojipkgs.fedoraproject.org/
-
-authtype = kerberos
-
-use_fast_upload = yes
diff --git a/stg_fedoraproject_org b/stg_fedoraproject_org
index 7ad7c0c..940422e 100644
--- a/stg_fedoraproject_org
+++ b/stg_fedoraproject_org
@@ -2,7 +2,6 @@
  STG.FEDORAPROJECT.ORG = {
         kdc = https://id.stg.fedoraproject.org/KdcProxy
         pkinit_anchors = FILE:/etc/pki/ipa/stg_fedoraproject_ipa_ca.crt
-        auto_fast_armor = true
  }
 [domain_realm]
  .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG