diff --git a/debian/control b/debian/control
index c46f7f1a125c73a9f6b9ef8b0c8cb3792c798d50..0c578bbb96d45c85247dab1e7092ae256435d6dc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Maintainer: Apertis package maintainers <packagers@lists.apertis.org>
 Standards-Version: 4.6.1
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-python3,
-               crossbuild-essential-armhf,
-               crossbuild-essential-arm64,
                python3,
                python3-cryptography,
                python3-pyelftools
@@ -15,8 +13,8 @@ Vcs-Git: https://gitlab.apertis.org/pkg/optee-os.git
 Homepage: http://optee.readthedocs.io/
 Rules-Requires-Root: no
 
-Package: optee-os-k3
-Architecture: any
+Package: optee-os
+Architecture: arm64
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: OP-TEE Trusted OS
diff --git a/debian/optee-os-k3.install b/debian/optee-os.install
similarity index 100%
rename from debian/optee-os-k3.install
rename to debian/optee-os.install
diff --git a/debian/rules b/debian/rules
index 14e0ce2ae388be2a0e5d49da3b9deef32b284b40..e8707457cc3eecc5e8d2af7ff45a839c2bea1b88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,16 @@
 #!/usr/bin/make -f
 
-COMPILE=arm-linux-gnueabihf-
-COMPILE64=aarch64-linux-gnu-
+export COMPILE = aarch64-linux-gnu-
 
-PLATFORM = k3-am62x
-CFG_ARM64_core = y
+export PLATFORM = k3-am62x
+
+export CFG_ARM64_core = y
+
+# hardening -> relro breaks compilation with error "'-Wl,-z,relro' unknown"
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-relro
+
+# Build only 64-bit TAs
+export CFG_USER_TA_TARGETS = ta_arm64
 
 %:
 	dh $@
@@ -12,6 +18,5 @@ CFG_ARM64_core = y
 override_dh_auto_build:
 	make \
 	    CROSS_COMPILE=${COMPILE32} \
-	    CROSS_COMPILE64=${COMPILE64} \
             PLATFORM=${PLATFORM} \
             CFG_ARM64_core=${CFG_ARM64_core}