diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml
index ed3416c6..da0a5d86 100644
--- a/.github/workflows/gitlab-ci.yml
+++ b/.github/workflows/gitlab-ci.yml
@@ -22,8 +22,8 @@ jobs:
         # Skip on forks or pull requests from forks due to missing secrets.
         if: github.repository == 'pulp-platform/MAGIA' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         with:
-          domain: iis-git.ee.ethz.ch
-          repo: github-mirror/magia
-          token: ${{ secrets.GITLAB_TOKEN }}
+          domain: ${{ secrets.GITLAB_UNIBO_SERVER }}
+          repo: github-mirror/MAGIA
+          token: ${{ secrets.GITLAB_UNIBO_TOKEN }}
           poll-count: 1000
           poll-period: 60
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 0ee5b8ec..b9237559 100644
--- a/Makefile
+++ b/Makefile
@@ -423,7 +423,7 @@ ifeq ($(core), RI5CY)
 else
 	@sed -i '/^  cv32e40p:$$/,/^  cv32e40x:/ { s|^    revision: .*|    revision: $(CV32E40P_REV)|; 			s|^      Git: .*|      Git: $(CV32E40P_GIT)|; 		}' Bender.lock
 endif
-	$(BENDER) update
+	$(BENDER) checkout
 	$(BENDER) script vsim          \
 	--vlog-arg="$(compile_flag)"   \
 	--vcom-arg="-pedanticerrors"   \
@@ -571,9 +571,9 @@ hw-clean:
 hw-all: hw-clean hw-lib hw-compile hw-opt
 
 # Nonfree components
-MAGIA_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:pulp-restricted/magia-nonfree
+MAGIA_NONFREE_REMOTE ?= $(GITLAB_UNIBO_SSH_STRING)/magia/nonfree.git
 MAGIA_NONFREE_DIR ?= nonfree
-MAGIA_NONFREE_COMMIT ?= 825ec37e40a1b46749cbcd59ff77f75d7a8f0296
+MAGIA_NONFREE_COMMIT ?= 1c281e44b3459b4cfd6c87adc21b5092abf22ea5
 
 .PHONY: magia-nonfree-init
 MAGIA_NONFREE_DEPS ?= 1
diff --git a/magia-sdk b/magia-sdk
index 6f1b4831..7525dd2b 160000
--- a/magia-sdk
+++ b/magia-sdk
@@ -1 +1 @@
-Subproject commit 6f1b483110f6234f1f89671b3da7e9b446c84426
+Subproject commit 7525dd2b8d9245a67737a279a5dd15927b7230ad