diff --git a/goconserver/debian/changelog b/goconserver/debian/changelog
new file mode 100644
index 0000000..69af85a
--- /dev/null
+++ b/goconserver/debian/changelog
@@ -0,0 +1,7 @@
+goconserver (0.3.3-1) unstable; urgency=medium
+
+  * Build v0.3.3 from source for xCAT
+  * Remove RC4 and 3DES ciphers from TLS configuration
+  * Remove etcd storage backend (incompatible with modern Go modules)
+
+ -- Vinicius Ferrao <ferrao@versatushpc.com.br>  Sat, 10 May 2025 13:43:11 -0300
diff --git a/goconserver/debian/compat b/goconserver/debian/compat
new file mode 100644
index 0000000..b1bd38b
--- /dev/null
+++ b/goconserver/debian/compat
@@ -0,0 +1 @@
+13
diff --git a/goconserver/debian/control b/goconserver/debian/control
new file mode 100644
index 0000000..bf61029
--- /dev/null
+++ b/goconserver/debian/control
@@ -0,0 +1,14 @@
+Source: goconserver
+Section: admin
+Priority: optional
+Maintainer: xCAT <xcat-user@lists.sourceforge.net>
+Build-Depends: debhelper (>= 13), golang
+Standards-Version: 4.6.0
+Homepage: https://github.com/xcat2/goconserver
+
+Package: goconserver
+Architecture: any
+Depends: ${misc:Depends}
+Description: Console server written in Go for xCAT
+ goconserver is a scalable console server written in Go. It provides
+ console logging and management for xCAT cluster nodes.
diff --git a/goconserver/debian/rules b/goconserver/debian/rules
new file mode 100755
index 0000000..37f2d19
--- /dev/null
+++ b/goconserver/debian/rules
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+export CGO_ENABLED=0
+%:
+	dh $@
+override_dh_auto_configure:
+override_dh_auto_build:
+	go build -ldflags "-X main.Version=0.3.3" -o goconserver goconserver.go
+	go build -ldflags "-X main.Version=0.3.3" -o congo cmd/congo.go
+override_dh_auto_install:
+	install -D -m 755 goconserver $(CURDIR)/debian/goconserver/usr/bin/goconserver
+	install -D -m 755 congo $(CURDIR)/debian/goconserver/usr/bin/congo
+	install -D -m 644 etc/goconserver/server.conf $(CURDIR)/debian/goconserver/etc/goconserver/server.conf
+	mkdir -p $(CURDIR)/debian/goconserver/var/log/goconserver
+override_dh_auto_test:
+override_dh_auto_clean:
+	rm -f goconserver congo
+override_dh_dwz:
+override_dh_strip:
diff --git a/goconserver/debian/source/format b/goconserver/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/goconserver/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/goconserver/make_deb.sh b/goconserver/make_deb.sh
new file mode 100755
index 0000000..78501b6
--- /dev/null
+++ b/goconserver/make_deb.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+VERSION=0.3.3
+REPO=https://github.com/xcat2/goconserver.git
+REF=master
+
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" EXIT
+
+echo "Cloning goconserver..."
+git clone --depth 1 --branch "$REF" "$REPO" "$WORKDIR/goconserver-$VERSION"
+
+cd "$WORKDIR/goconserver-$VERSION"
+
+# etcd storage backend has broken deps with modern Go modules
+rm -rf storage/etcd.go storage/etcd/
+
+export GOPATH="$WORKDIR/gopath"
+export GOCACHE="$WORKDIR/gocache"
+export GOMODCACHE="$WORKDIR/gomodcache"
+export CGO_ENABLED=0
+
+go mod init github.com/xcat2/goconserver
+go mod tidy
+
+cp -rL "$SCRIPT_DIR/debian" .
+
+dpkg-buildpackage -uc -us
+
+echo "Built debs:"
+ls "$WORKDIR"/*.deb
+cp "$WORKDIR"/*.deb "$SCRIPT_DIR/../"
diff --git a/ipmitool/debian/compat b/ipmitool/debian/compat
index 7ed6ff8..b1bd38b 100644
--- a/ipmitool/debian/compat
+++ b/ipmitool/debian/compat
@@ -1 +1 @@
-5
+13
diff --git a/ipmitool/debian/control b/ipmitool/debian/control
index 4228a15..29569ad 100644
--- a/ipmitool/debian/control
+++ b/ipmitool/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.2.1
 
 Package: ipmitool-xcat
 Architecture: i386 amd64 ia64 ppc64el
-Depends: libc6 (>= 2.15), libssl1.1 (>= 1.1.0) | libssl1.0.0 (>=1.0.0), lsb-base
+Depends: libc6 (>= 2.15), libssl3 | libssl1.1 (>= 1.1.0) | libssl1.0.0 (>=1.0.0), lsb-base
 Suggests: openipmi
 Description: utility for IPMI control with kernel driver or LAN interface
  A utility for managing and configuring devices that support the
diff --git a/ipmitool/debian/patches/0001-CVE-2011-4339-OpenIPMI.patch b/ipmitool/debian/patches/0001-CVE-2011-4339-OpenIPMI.patch
new file mode 120000
index 0000000..80f27c6
--- /dev/null
+++ b/ipmitool/debian/patches/0001-CVE-2011-4339-OpenIPMI.patch
@@ -0,0 +1 @@
+../../0001-CVE-2011-4339-OpenIPMI.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0003-ipmitool-1.8.11-set-kg-key.patch b/ipmitool/debian/patches/0003-ipmitool-1.8.11-set-kg-key.patch
new file mode 120000
index 0000000..b28ce75
--- /dev/null
+++ b/ipmitool/debian/patches/0003-ipmitool-1.8.11-set-kg-key.patch
@@ -0,0 +1 @@
+../../0003-ipmitool-1.8.11-set-kg-key.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0004-slowswid.patch b/ipmitool/debian/patches/0004-slowswid.patch
new file mode 120000
index 0000000..203f819
--- /dev/null
+++ b/ipmitool/debian/patches/0004-slowswid.patch
@@ -0,0 +1 @@
+../../0004-slowswid.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0005-sensor-id-length.patch b/ipmitool/debian/patches/0005-sensor-id-length.patch
new file mode 120000
index 0000000..3194bde
--- /dev/null
+++ b/ipmitool/debian/patches/0005-sensor-id-length.patch
@@ -0,0 +1 @@
+../../0005-sensor-id-length.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0006-enable-usb.patch b/ipmitool/debian/patches/0006-enable-usb.patch
new file mode 120000
index 0000000..e8939b2
--- /dev/null
+++ b/ipmitool/debian/patches/0006-enable-usb.patch
@@ -0,0 +1 @@
+../../0006-enable-usb.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0007-check-input.patch b/ipmitool/debian/patches/0007-check-input.patch
new file mode 120000
index 0000000..178f977
--- /dev/null
+++ b/ipmitool/debian/patches/0007-check-input.patch
@@ -0,0 +1 @@
+../../0007-check-input.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0008-add-extern.patch b/ipmitool/debian/patches/0008-add-extern.patch
new file mode 120000
index 0000000..e3542b9
--- /dev/null
+++ b/ipmitool/debian/patches/0008-add-extern.patch
@@ -0,0 +1 @@
+../../0008-add-extern.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0009-best-cipher.patch b/ipmitool/debian/patches/0009-best-cipher.patch
new file mode 120000
index 0000000..0ff9d97
--- /dev/null
+++ b/ipmitool/debian/patches/0009-best-cipher.patch
@@ -0,0 +1 @@
+../../0009-best-cipher.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0010-pef-missing-newline.patch b/ipmitool/debian/patches/0010-pef-missing-newline.patch
new file mode 120000
index 0000000..8dafd49
--- /dev/null
+++ b/ipmitool/debian/patches/0010-pef-missing-newline.patch
@@ -0,0 +1 @@
+../../0010-pef-missing-newline.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0011-expand-sensor-name-column.patch b/ipmitool/debian/patches/0011-expand-sensor-name-column.patch
new file mode 120000
index 0000000..4e776dd
--- /dev/null
+++ b/ipmitool/debian/patches/0011-expand-sensor-name-column.patch
@@ -0,0 +1 @@
+../../0011-expand-sensor-name-column.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0013-quanta-oem-support.patch b/ipmitool/debian/patches/0013-quanta-oem-support.patch
new file mode 120000
index 0000000..bc1f10c
--- /dev/null
+++ b/ipmitool/debian/patches/0013-quanta-oem-support.patch
@@ -0,0 +1 @@
+../../0013-quanta-oem-support.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0014-lanplus-cipher-retry.patch b/ipmitool/debian/patches/0014-lanplus-cipher-retry.patch
new file mode 120000
index 0000000..7f345e0
--- /dev/null
+++ b/ipmitool/debian/patches/0014-lanplus-cipher-retry.patch
@@ -0,0 +1 @@
+../../0014-lanplus-cipher-retry.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0015-lanplus-Cleanup.-Refix-6dec83ff-fix-be2c0c4b.patch b/ipmitool/debian/patches/0015-lanplus-Cleanup.-Refix-6dec83ff-fix-be2c0c4b.patch
new file mode 120000
index 0000000..52e1a48
--- /dev/null
+++ b/ipmitool/debian/patches/0015-lanplus-Cleanup.-Refix-6dec83ff-fix-be2c0c4b.patch
@@ -0,0 +1 @@
+../../0015-lanplus-Cleanup.-Refix-6dec83ff-fix-be2c0c4b.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/0016-el10-gcc14-missing-intf-getters.patch b/ipmitool/debian/patches/0016-el10-gcc14-missing-intf-getters.patch
new file mode 120000
index 0000000..ba1a590
--- /dev/null
+++ b/ipmitool/debian/patches/0016-el10-gcc14-missing-intf-getters.patch
@@ -0,0 +1 @@
+../../0016-el10-gcc14-missing-intf-getters.patch
\ No newline at end of file
diff --git a/ipmitool/debian/patches/series b/ipmitool/debian/patches/series
index 9c1f73f..4429900 100644
--- a/ipmitool/debian/patches/series
+++ b/ipmitool/debian/patches/series
@@ -1,5 +1,19 @@
+0001-CVE-2011-4339-OpenIPMI.patch
+0002-openssl.patch
+0003-ipmitool-1.8.11-set-kg-key.patch
+0004-slowswid.patch
+0005-sensor-id-length.patch
+0006-enable-usb.patch
+0007-check-input.patch
+0008-add-extern.patch
+0009-best-cipher.patch
+0010-pef-missing-newline.patch
+0011-expand-sensor-name-column.patch
+0012-CVE-2020-5208.patch
+0013-quanta-oem-support.patch
+0014-lanplus-cipher-retry.patch
+0015-lanplus-Cleanup.-Refix-6dec83ff-fix-be2c0c4b.patch
+0016-el10-gcc14-missing-intf-getters.patch
 ipmitool-1.8.18-saneretry.patch
 ipmitool-1.8.18-rflash.patch
 ipmitool-1.8.18-signal.patch
-0002-openssl.patch
-0012-CVE-2020-5208.patch
diff --git a/ipmitool/debian/rules b/ipmitool/debian/rules
index 97feb6b..816ed13 100755
--- a/ipmitool/debian/rules
+++ b/ipmitool/debian/rules
@@ -21,7 +21,7 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	dh --with quilt build
+	dh build --with quilt
 
 ifneq ($(TARGET_ARCH),ppc64el)
 	./configure --prefix=/usr \
@@ -65,7 +65,7 @@ install: install-arch #install-indep
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
+	dh_prep -i
 	dh_installdirs -i
 
 # Add here commands to install the indep part of the package into
@@ -77,7 +77,7 @@ install-indep:
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -a
+	dh_prep -a
 	dh_installdirs -a
 
 # Add here commands to install the arch part of the package into