diff --git a/.github/workflows/build-qt.yml b/.github/workflows/build-qt.yml
index d4fde2b9..66586f65 100644
--- a/.github/workflows/build-qt.yml
+++ b/.github/workflows/build-qt.yml
@@ -17,4 +17,4 @@ jobs:
       run: |
         cd qt/i2pd_qt
         qmake
-        make -j3
+        make release -j3
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a776df92..8fa752ff 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,4 +18,4 @@ jobs:
         sudo apt-get update
         sudo apt-get install build-essential libboost1.74-dev libminiupnpc-dev libssl-dev zlib1g-dev
     - name: build application
-      run: make USE_UPNP=${{ matrix.with_upnp }} -j3
+      run: make USE_AESNI=no USE_UPNP=${{ matrix.with_upnp }} -j3
diff --git a/Makefile.linux b/Makefile.linux
index 6a7590c1..b544056f 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -59,6 +59,6 @@ endif
 
 ifeq ($(USE_AESNI),yes)
 ifeq (, $(findstring arm, $(SYS))$(findstring aarch64, $(SYS))) # no arm and aarch64 in dumpmachine
-	NEEDED_CXXFLAGS += -D__AES__ -maes
+	NEEDED_CXXFLAGS += -D__AES__
 endif
 endif
diff --git a/libi2pd/CPU.cpp b/libi2pd/CPU.cpp
index 3b9e9f80..5b5f8e63 100644
--- a/libi2pd/CPU.cpp
+++ b/libi2pd/CPU.cpp
@@ -37,11 +37,11 @@ namespace cpu
 			__cpuid(0x00000001, info[0], info[1], info[2], info[3]);
 #ifdef __AES__
 			if ((info[2] & bit_AES || __builtin_cpu_supports("aes")) && AesSwitch) {
-				aesni = true;  // AESNI
+				aesni = true;
 			}
 #endif // __AES__
 			if ((info[2] & bit_AVX || __builtin_cpu_supports("avx")) && AvxSwitch) {
-				avx = true;  // AVX
+				avx = true;
 			}
 		}
 #endif // defined(__x86_64__) || defined(__i386__)
diff --git a/qt/i2pd_qt/i2pd_qt.pro b/qt/i2pd_qt/i2pd_qt.pro
index 34b8ebfc..85f57a42 100644
--- a/qt/i2pd_qt/i2pd_qt.pro
+++ b/qt/i2pd_qt/i2pd_qt.pro
@@ -10,8 +10,10 @@ CONFIG += strict_c++ c++11
 CONFIG(debug, debug|release) {
     message(Debug build)
     DEFINES += DEBUG_WITH_DEFAULT_LOGGING
+    I2PDMAKE += DEBUG=yes
 } else {
     message(Release build)
+    I2PDMAKE += DEBUG=no
 }
 
 SOURCES += DaemonQT.cpp mainwindow.cpp \
@@ -73,11 +75,11 @@ FORMS += mainwindow.ui \
 
 LIBS += $$PWD/../../libi2pd.a $$PWD/../../libi2pdclient.a -lz
 
-libi2pd.commands = cd $$PWD/../../ && mkdir -p obj/libi2pd && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes DEBUG=no api
+libi2pd.commands = cd $$PWD/../../ && mkdir -p obj/libi2pd && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE api
 libi2pd.target = $$PWD/../../libi2pd.a
 libi2pd.depends = FORCE
 
-libi2pdclient.commands = cd $$PWD/../../ && mkdir -p obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes DEBUG=no api_client
+libi2pdclient.commands = cd $$PWD/../../ && mkdir -p obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE api_client
 libi2pdclient.target = $$PWD/../../libi2pdclient.a
 libi2pdclient.depends = FORCE