diff --git a/.gitattributes b/.gitattributes
index da0f990..04b4f49 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
 *.st linguist-language=Smalltalk
+*.st eol=lf
+*.st text diff
diff --git a/.github/workflows/loading-groups.yml b/.github/workflows/loading-groups.yml
index 93e6773..8567035 100644
--- a/.github/workflows/loading-groups.yml
+++ b/.github/workflows/loading-groups.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-9.0, Pharo64-8.0 ]
+        smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
         load-spec: [ deployment, dependent-sunit-extensions, tests, development, tools, examples, core, healthcheck, metrics, metrics-http, json-rpc, app-control, app-info, app-config, loggers ]
     name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
     steps:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 99d7a81..2af3254 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        smalltalk: [ Pharo64-9.0, Pharo64-8.0 ]
+        smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
     name: ${{ matrix.smalltalk }}
     steps:
       - uses: actions/checkout@v2
diff --git a/LICENSE b/LICENSE
index fbd83a6..0567ecc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2021 Buenos Aires Smalltalk Contributors
+Copyright (c) 2018-2022 Buenos Aires Smalltalk Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 1a41170..9f19593 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Stargate is a library supporting the creation of HTTP based RESTful APIs.
 [![GitHub release](https://img.shields.io/github/release/ba-st/Stargate.svg)](https://github.com/ba-st/Stargate/releases/latest)
 [![Pharo 8.0](https://img.shields.io/badge/Pharo-8.0-informational)](https://pharo.org)
 [![Pharo 9.0](https://img.shields.io/badge/Pharo-9.0-informational)](https://pharo.org)
+[![Pharo 10](https://img.shields.io/badge/Pharo-10-informational)](https://pharo.org)
 
 Quick links
 
diff --git a/source/BaselineOfStargate/BaselineOfStargate.class.st b/source/BaselineOfStargate/BaselineOfStargate.class.st
index b23f1dd..5dd8f47 100644
--- a/source/BaselineOfStargate/BaselineOfStargate.class.st
+++ b/source/BaselineOfStargate/BaselineOfStargate.class.st
@@ -16,7 +16,7 @@ BaselineOfStargate >> baseline: spec [
 			spec
 				group: 'CI' with: 'Tests';
 				group: 'Examples' with: #('Deployment' 'Stargate-Examples');
-				group: 'Tools' with: #('Teapot-Tools');
+				group: 'Tools' with: #('Hyperspace-Tools');
 				group: 'Development' with: #('Tests' 'Tools')
 			]
 ]
@@ -38,6 +38,7 @@ BaselineOfStargate >> setUpDependencies: spec [
 	spec
 		baseline: 'Hyperspace' with: [ spec repository: 'github://ba-st/Hyperspace:v3' ];
 		project: 'Hyperspace-Deployment' copyFrom: 'Hyperspace' with: [ spec loads: 'Deployment' ];
+    project: 'Hyperspace-Tools' copyFrom: 'Hyperspace' with: [ spec loads: 'Tools' ];
 		project: 'Hyperspace-SUnit'
 		copyFrom: 'Hyperspace'
 		with: [ spec loads: 'Dependent-SUnit-Extensions' ].
@@ -48,8 +49,7 @@ spec
 
 	spec
 		baseline: 'Teapot' with: [ spec repository: 'github://zeroflag/Teapot:v2.6.0/source' ];
-		project: 'Teapot-Deployment' copyFrom: 'Teapot' with: [ spec loads: 'Deployment' ];
-		project: 'Teapot-Tools' copyFrom: 'Teapot' with: [ spec loads: 'Tools' ].
+		project: 'Teapot-Deployment' copyFrom: 'Teapot' with: [ spec loads: 'Deployment' ].
 
 	spec
 		baseline: 'JSONWebToken' with: [ spec repository: 'github://noha/JSONWebToken:0.3/source' ];