diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile
index 896900067..e578e38e7 100644
--- a/utils/docker-compose/Makefile
+++ b/utils/docker-compose/Makefile
@@ -1,49 +1,47 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=docker-compose
-PKG_VERSION:=1.29.2
+PKG_NAME:=compose
+PKG_VERSION:=2.1.0
 PKG_RELEASE:=$(AUTORELEASE)
-
-PYPI_NAME:=docker-compose
-PKG_HASH:=4c8cd9d21d237412793d18bd33110049ee9af8dab3fe2c213bbd0733959b09b7
-
-PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
-include ../../lang/python/pypi.mk
-include $(INCLUDE_DIR)/package.mk
-include ../../lang/python/python3-package.mk
+PKG_SOURCE:=v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}?
+PKG_HASH:=48b20b1b75de0e517deb0e29122ecdb01982f136e68429bdf6a97121701d4274
 
-PYTHON3_PKG_SETUP_ARGS:=
+PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/docker/compose/v2
+GO_PKG_BUILD_PKG:=github.com/docker/compose/v2/cmd
+GO_PKG_LDFLAGS_X:=github.com/docker/compose/v2/internal.Version=v$(PKG_VERSION)
+GO_PKG_TAGS:=e2e,kube
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-package.mk
 
 define Package/docker-compose
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Docker Compose
   URL:=https://github.com/docker/compose
-  DEPENDS+=+docker \
-      +python3-light \
-      +python3-cached-property \
-      +python3-distro \
-      +python3-distutils \
-      +python3-docopt \
-      +python3-docker \
-      +python3-dockerpty \
-      +python3-dotenv \
-      +python3-jsonschema \
-      +python3-logging \
-      +python3-openssl \
-      +python3-pkg-resources \
-      +python3-requests \
-      +python3-texttable \
-      +python3-yaml
+  DEPENDS:=$(GO_ARCH_DEPENDS) +docker
 endef
 
 define Package/docker-compose/description
   Multi-container orchestration for Docker
 endef
 
-$(eval $(call Py3Package,docker-compose))
+define Package/docker-compose/install
+	$(INSTALL_DIR) $(1)/usr/lib/docker/cli-plugins/
+	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/cmd $(1)/usr/lib/docker/cli-plugins/docker-compose
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(LN) ../lib/docker/cli-plugins/docker-compose $(1)/usr/bin/docker-compose
+endef
+
+$(eval $(call GoBinPackage,docker-compose))
 $(eval $(call BuildPackage,docker-compose))
-$(eval $(call BuildPackage,docker-compose-src))